Deleted a couple unnecessary classes