What I did was upgrade my recovery with Goo, I removed the SD card, I wiped the internal memory (not sure if this is necessary but what the hell), factory wiped, installed 7.1, once the phone booted up I logged in to gmail, let it sync, didn't install anything else and rebooted just to make sure...