Small clean up in s.u.t.common