Default [Q] Real GPE back to stock

Hi, I bought a GPE directly from google, played around a bit with it and now I need it back to stock for a warranty claim.

I unlocked, installed: TWRP, Root, xposed framework and busybox, and then S-Off with Rumrunner.

I think I should 1- flash stock recovery and then do:

2. - First remove the Tampered Flag. Instructions are in this thread

3. - Second Lock the bootloader. Instructions are in this thread

4- S-ON: fastboot oem writesecureflag 3
5- Delete SuperSU Binaries and apk

Is this correct? the procedure comes from a back to Sense thread and I wanted to be sure I wont screw up on my GPE.