Remove nodes from their previous structures

When manipulation methods operate on existing nodes, ensure that these
nodes are removed from their previous structures.
Merge pull request #350 from jugglinmike/cleanup-manip

Remove nodes from their previous structures