Eliminated StructureMapDoctor #86