multi-node: minor clean up

Change-Id: I3e93d3f71ece834b9f19952902b3cdfbba89a39a