Cleaning up the  project template