Removed pointless Code