One more cleanup to utils