Re: hmm cleanups, v2