Remove a bunch of old code that has been replaced.  Consolidate code that is waiting to be replaced.