Clean up in project 6