[TASK] Cleanup