All cleaned up. This is a first candidate for the solution set. All the test drivers are removed. All &&&MJM & DEBUG comments are gone.