Removed uneccessary code