clean up Utils.java for easier merging