Cleanup, some work

Removed the cruft (most of it at least) and continued working on the
networkx implementation