mapping: cleanup

Change-Id: I126589619de15382b7d6ceef7f28aeb404c04633
3 files changed