Initial clean up of the Dataset Template workflow.