CON-1444 | Global Navigation model cleanup