hs: cleanup