Slimmed up the build a little bit