Cleaned up some unused classes