Refactored to create RemoveNode()