Simplify build