[012] Cleaning code