Remove unnecesary #include add dump calls pulled out of .h file