Remove lingering dependencies on CBL utility libraries