More clean up

Found a few more + ones mentioned in the diff