[utility] utility source added, latest cleanups