cleanup: remove old NP-related stuff.
comments and new speed tests
more rewriting and cleanup