Cleaning up the project again