Small random changes

Mostly removal of unneeded includes