Cleanup: remove device-specific mapping.