more cleanup of mappinganalyzer