Deleted a few unused classes