Merge "cutils: first pass at cleaning up legacy/obsolete code in cutils"