remove more HM stuff