removing some unnecessary code