Revert "Enhance check expiration performance"

This reverts commit 1a49689e77727b2e46d7d281e7a7f8e85f20962e.
Merge pull request #277 from pgiraud/revert_enhance_check_expiration

Revert "Enhance check expiration performance"