[COOK-2377] Do not perform node.save

See [COOK-2377] for further details.
cleanups for code smell