Cleaning up build scripts
Cleaning up build scripts
WIP build script cleanup