Default kk gpe reflash

I'm currenlty on KK GPE and have been very pleased so far. my only problem is the poor battery performance. Someone suggested using safe mode to try and find any suspect apps, but i haven't been able to get into safe mode. the phone seems to freeze on the startup animation when i press the volume buttons, so my question is this:

if i comment out the part that flashes the modems in the original zip, but keep everything else so i'm essentially reflashing the phone (I'm too lazy to redo the gsm hack) will i be getting a "factory reset" phone that will work on gsm? I know it's only one more thing to do, but i'm thinking i just need a fresh reflash. I'm already going ot be reinstalling all apps so was hoping ot avoid one more part of the setup process.

thanks