* fixes locks not getting unlocked

* only hold the lock in DropNeighbor while deleted the neighbor entry