Header cleanup

First batch cleanup of artifacts left behind by source/header file split by class