removed classes and etc