[TASK] Cleanup code