Clean up project a bit