Removed commented out code till we can get .cpp files to behave