External nodes removal

Tom, I'm experimenting with the branch workflow so I made this fix on the 2014.1 branch.  This covers part of backlog issue 15