Removed some unnecessary lines of code