[MAGEMEP-113] Cleaning old code