Simplify build even more