Code clean up.  Removed several hundred lines of unused code.