Remove -2 -> -1 remapping, its not needed anymore as we must remap all