Cleanup expiration logic