Improve `map.remove()`
Merge branch 'dev2' into test