clean up - no code injection necessary (commented out anyway)
new type 'DatasetMappingType' for objective data
updated code for new 'DatasetMappingType'