More cleaning.  No implicit through hsmg.