[GAIA BUG984584] - Cleaning the code