Removed classes from Datatype