Deleted a couple of unused classes