[TASK] Clean up