I too have this issue, and fixed it the way you describe.
There are still superfluous names on the start menu which may or may not slow down bootup.
Can they be removed?
thanks