removed some unnecessary lines