Removed passport dependency