More NPM cleanup