Remove util resolveString, resolveInt, fine tune.