[GAIA BUG886754] - Removing trash from the code