Removing re-testing of rate-limiting, and reusing payloads