removing unnecessary code