Fixed DeviceService removal