removed classes which do not belong here