cleanup - replace `from scm import *` with defs that are actually used