Removed some now redundant classes