[TASK] Cleanup codes