Merge pull request #1660 from TheBlueMatt/2022-08-cleanup-ratelimits