Issue #3253849: General Code Cleanup

Bryan Sharpe requested to merge issue/usage_data-3253849:3253849-general-code-cleanup into 2.0.x Dec 10, 2021