Remove the call to the token_generator