Removed some unused classes