Simplify build #63