1377 - Drop SCM class in favor of global function