Removed dependency on util.