[GAIA] - Removing unneeded code