Commenting Util, and remove unused stuff.