Clean up bits of old nsh implementation