Clean up history with upstream and make PR

[ChamzasKonstantinos]

There are several changes with the upstream repo, some of the are specific to our setup but some are unnecessary and some should be pushed to the main repo.
We should clean the unnecessary changes e.g. different format combine all of our changes in a single commit and try to push the necessary changes to the main repo.