Cleanup netjack2 code (in progress).