Unneded code deleted