removal unnecessary code