Removed some unnecessary lines and unnecessary import.