I see all kinds of methods to unroot my galaxy S4 (need to clean it up to return it on warranty). Simplest is just to use "Full Unroot" from superuser app. Then some say I need to flash the factory rom with Odin, and some say I need to use the "Triangle Away" app, then flash with Odin. My phone is rooted, but I have never installed any custom ROMS. I really only root it to get wireless wifi. Will unrooting with the superuser app be sufficient, or do I need to get into all this other stuff?