Removed NavigationContext references