* removed some unnecessary lines