Cleanup: npm purism, tap clearity and more