remove mappings
Merge branch 'remove-mappings'