[TASK] Clean up done