Cleanup the util package
Cleanup the util package