Remove deprecation warnings from some CommonTools
subsystems
#37238
+45
−85
CommonTools
subsystems
#37238