Move driver cleanup to WF-integration.