Clean up the project a bit