Added Utility.bin support and some cleanup