Default [Q] Returned to stock, still have Google logo on boot

I've got a Rogers M7 that I had transmorgrified into a Google Play Edition HTC One. That was fun for a bit, but I'm putting back to stock to sell. I got through the CID change, stock nandroid restore, stock recovery flash. But I have an interesting issue - when the phone boots I always get the Google logo first, then the HTC logo and then into the OS. Would anyone have some hints as to how I make the phone behave like stock again on boot?