removed uneccessary classes