Removed some classes that we weren't going to use