Removed unused ns's; Dan's neighbor ns is now in feature/new-neighbors