Fixing build server and adding clean up.
Cleaning some commented dead code.