Simplify build script a bit