So I think I'm going to go back to stock after trying out CyanogenMod for the past month or so. I've just been having a few lag issues and hiccups here and there that I never had when the phone wasn't rooted. Plus, I don't take advantage of the root anyways, besides the occasional wifi tether, but I can easily tether with with the USB and PDANet. My primary question is this. Will I have to re-enable the OTA updates? I remember when I re-flashed to 2.0.1 to root, I had to disable the OTA update notification. Is the easiest way to get back to 2.1 doing the RSDLite to 2.0.1 and then doing the OTA update?