Comment 55 for bug 116080

You will probably need to break this into smaller patches before you send it in (not that there's any need to do it now), and I don't think you need to include the menu removal if it still doesn't work by that time. Just removing the shortcuts would be a large improvement, and usually empty menus will be invisible.

The separate .lnk and .desktop files on desktop shortcuts is a separate problem that you don't have to solve. It's been suggested that we should teach desktop environments to use the .lnk files so that .desktop files aren't needed, but we would need a way to store the wine prefix.