Some clean-up of the code and supression of the call to the plot routines in the main. That is replced by Anthony's code.