[TASK] Cosmetics cleanup