CON-1444 | GlobalNavigation code cleanup