refs #8755. Remove unused imports and modify import packages.
Merge branch 'feature/8755_remove_dead_code' into develop