Remove some debugging, fix build script.