Remove dependency on controller config-util