Removed classes that were accidentally duplicated