Removed uses of with-db