Remove device id workaround