Refs #8431 Remove unused modules.
Merge branch 'feature/8431_remove_unused_modules' into develop