Implement removal of access_token and refresh_token tags from authorizat...

...ion