(refs #2)Remove AnnotationMapper from 2.10 branch