fixes #6091 - menu removal wasn't traversing menu hierarchy