Lazy-eager cleanup