Remove unneeded Mapping compat code