Corrects valgrind errors; Removes UpdateNbrs()