Simplify build steps