base cleanups for new sgit module