hm: cleanup