Cleanup in build script