Removed unused mixins (NavigationStateManager)