Remove utils from services