[MH] [60545038] Remove dependency on utils