Remove references to util.js