HM moved to CoreTypes, components cleanup