3473 crash after deleting incoming node

This commit addresses issue 3473 (crash after deleting incoming node). It also cleans up some obsolete code.

http://www.na-mic.org/Bug/view.php?id=3473