Clean up more old commented code
Edit build script and also fix bug in it