Update build script
Cleanup