Cleanups.
More cleanups.
Fix the build.