[GAIA BUG969393] - Cleaning the repo from non working parts of the patch