Remove Util references