Cleaning up some classes