Revert "Enhance check expiration performance"

This reverts commit 1a49689e77727b2e46d7d281e7a7f8e85f20962e.