SCM build touch; some cleanups