Followup Scm/GitScm cleanup