Nothing to see here, move along.

Removed unnecessary code and patched up code for the new build script.