Cleaned up some junk so the Test classes would run.  Some other random clean up and commenting.