nsd: clean up + more work on denormalization
nsd tools update