Removing unnecessary passport dependency