Prepped for build
Restore wizard mode
Removed old graphical mode [tracker #1493]