Updated node removal flow changes to solve issues which caused an error.
These changes have appeared to work.