Cleaning up

Cleaning up un-usable classes