Cleaning up more header files, removing accidental couts