(ENoC) Fixes to remove pipeline code.  Working.

Still some pipeline code causing problems.

Also, network wrap had a minor error.

All files should be working.