Scc cleanup