Remove passport related code