Removed some Unnecessary lines