major clean-up of initial build script