Clean up some deprecated methods in Util.java