remove the legacy username upgrade junk