Refs #7932. Removing unneeded code.
Refs #7932. Resolving conflict.
Merge branch 'feature/7932_mdviewer_deadcode' into develop