Revert "Refs #9413 functions for duplicated code"

This reverts commit 3de74fc60d09dc4679ee8bd2db7540b89cb722b5.
Merge branch 'feature/9413_AnvredCorrections_TOPAZ_additions' into develop