Extract out pkd_util, start cleanup.