removing a few more classes