remove use of user_token_obj where it no longer exists