Revert "adding or mapping"

This reverts commit b0bb83305b20395274b22af47c3d5713752e2b8a.