Cleanup
Fix expiration validation