Remove Custom OTA Stuff for now