Cleanup and adding class-level expiry.