removed uneccessary code