Refs #8431 Remove unused modules.
Merge remote-tracking branch 'origin/feature/8431_remove_unused_modules'