Simplify build process

@cap @stephentu