Removed unnecessary lines...