Removed references to ViewModeSwitcher