removed uneeded classes