Removed uneccessary classes