Cleanup the horrible Util class.