[TASK] Cleanup after merge