Included user, removed unnecessary lines