removed obsolete and conflicting mapping