Remove Workflow stuff from Genotype