Removed stuff for another class