Simplify build system