Workflow factory clean-up