Remove dependency on Utils