How to remove my Evasion Jailbreak?

I jailbroke my iPhone 4s (iOS 6.1) using Evasi0n when it came out. Since iOS 7 is coming out soon, I was wondering, would it work if I simply update to the new iOS? Or do I have to restore my phone first? I read somewhere that simply clicking "update" will remove the jailbreak as well as update the iOS, but a lot of people are saying that this doesn't work in case of the Evasi0n based jailbreak.
Can someone please clear this for me? I have a lot of data on my phone and a lot of in-app data as well and I don't want to lose them.

Backup
Restore
Update to iOS 7
Restore from Backup

Jailbreak would not transfer over.

Just have to update to the new OS and the jailbreak goes away. If you want to update to iOS 7 right away, you can register your device at http://www.instantudid.com/.It's $5, and then you can install the beta before everyone else.

At 1st Backup your phone through iTunes then Update to i OS 7 then Restore from Backup Via iClouds,
or 2nd way:
do factory reset your phone or manually download IPSW file then restore IPSW file through your computer you can follow bellow link, i was already take help from site

  • Unlocking an iPhone with Cydia or Evasion? I'm now jailbreaking my iPhone 4S and I do not know if I can unlock my iPhone by using Cydia or if there's a part which asks you on the Evasion software if you can?
  • If i jailbreak an iphone can i unlock it then remove jailbreak? So my Mum just got given an iPhone 4 by her brother, she needs to unlock it to be able to use it with her network but she doesn't want it jailbroken and doesn't won't to have to pay for it… So if I use jailbreak to unlock the device could I then remove Cydia and it would still be unlocked?
  • How to use evasion 7 1.0.2 to fix bug stuck at apple logo? Well i have an iphone 5 ios 7.0.4 and i tried to jailbreak it with evasion 7 1.0.1 it finished but got stuck on the apple logo on the last reboot now that evasion 7 1.0.2 is out i can fix it but i need to restore which i can't because i updated OTA and with my current internet i can't download the ipsw file (1.2 gb) is there a way to fix it or at least skip the iphone software update on itunes, anything?!
  • How to restore my iPhone to remove jailbreak and then unlock it? I want to remove the jailbreak from my iPhone by restoring it however it isn't unlocked to 3 so if I do it, it will ask for a sim which I don't have. Is there a way to restore it then unlock it to 3 without jailbreaking it? It is a iPhone 3GS by the way. Ffs just went on my phone and its stuck on the apple boot logo, the power button don't work so i can't turn it on or off and its not being recognised by itunes!