Question Restore factory, including safestrap

I have a damaged NJote 3 which I have to return to samsung to repair. I did a settingts -> wipe/factory restore and it got rid of everything and restored default software. I tried to unroot it with Kingo, and it said it wasn't rooted. But when you power up it still shows custom and safestrap loads. How can I get rid of all that so Samsung doesn't throw the phone back at me saying the warranty is void. Please help!
Galaxy Note 3 (Alliance 1.x, Jasmine 2.x)
LG G2 (sold)
Samsung Galaxy Nexus (sold)
Motorola Bionic (sold)
Motorola Droid (sold)
Android developers make my phones great. Thank you all.