Update to remove spatial.tools dep.