Remove target device

OTA updates fail with device assert. Make changes similar to meliusltexx