Actually, instead of doing the cleanup tasks in this action, perhaps we should transition to the logout subflow and let it handle this stuff. It's probably the safest solution with the least code duplication, but may be overkill in many cases. Thoughts?