node master cleanups