Removing extraneous includes

also a minor spacing thing