Re-enabled skipMutex=False on RemoveDevice.