Cleaned up the build.
Merge.