Remove dependency on util