refs #7047 REmove all remaining references to deprecated code.