more cleanup from main build script