Remove OTA stuff and clean up