More cleanup, the build completes now.