Simplify build process

@cap @stephentu 
Ok this sounds good to me