Remove interceptor and add scm separation column