Cleanup code, ensure that the project builds.