Removed some unnecessary lines