Removed uneeded code