HM: Cleanup imports e.d.