Revert "Propagate -j in make calls for better parallelization"

This reverts commit ccf7c394c02f03c0674bd86844e807cbc725eda0.
some small clenups

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Merge remote-tracking branch 'sm/master'