More refactoring.  Removing a lot of legacy code.