Removed kdtree, added neighborhood grid