Remove use of passport in code