Remove old code from Edit
Better guess at node address