Cleaning up OAuth management