Eliminate use of node-specific API