Cleaning up the project once more