removed two classes