Cleaning up some unused classes