Integrate OTA configuration capability and cleanup