Continued refactoring.  Removed dead code, including old pipeline environment straw-man.