Remove unused Utils class. Clean up some code.