Custom Package Menu Nav Cleanup Help Dynamo v2.1

While updating my Package to 2.1 I’m noticing the navigation is duplicating. This happens with ZeroTouch nodes as well but you could “hide” the first grouping.

Any solution for standard custom nodes in Dynamo 2.1x other than removing text from the Node Name?
I’m sure if I rename to “SetAnalyticalOff” it will be removed, but this is what I’m trying to avoid.
Any other solutions?
See image example below of duplicate navs.