Removing the target type from schema and test data

Put code in, take code out, we like waffles