Removed uneeded classes