make CleanupProvider an engine service