Revert "changed all instances of N and NS to add NumParallel, segfault due to line 235"

This reverts commit 836a38b12296c81b3f36a536efcbffd1c5e7d4cb.