2021-12-30 -- Prep for EoY Cleanup

only a few items to automate