Supress Warnings
Fixed some of the warnings caused by commented out code and a non virtual
destructor.