Cleaning up some defunct code.  Leaving some behind temporarily in case
it is useful.