Bring the conduit utils in here, remove the dep