remove `MoreCheckMapping` and merge its logic to other mappings