Removed the Util namespace (continued)