Unroot TMobile HTC One or Wipe

view story

http://forums.androidcentral.com – Not a great deal of experience, but I am thinking this should be pretty easy. I have a Stock HTC One that is unlocked and rooted with TRWP. I want to relock and unroot. Since its the stock ROM if I just relock wont it reload the stock ROM again on a hardboot? Or is there an easy way to leave the device rooted and just wipe all personal data from the device? Thanks in advance (HowTos)