Hack to cleanup until the workflow is fully updated