hs cleanup 2