simplifying some mappe dependencies, no main code change
3 files changed