Jim's changes to remove commented out code and some of the prints.