Removed classes that are no longer required