Build script cleanup