hm: builders cleanup