Clean up updating of authorization and subscription structures during

OAuth processing