[MAGEMEP-131] Cleaning code