Removed unnecessary classes

The classes are leftover from before porting to EF