removed more classes