Remapping no longer needed