Refs #7932. Removing unneeded code.
Refs #7932. Resolving conflict.
Merge remote-tracking branch 'origin/feature/7932_mdviewer_deadcode'