More bug fixes.

Took cleanup() routine out of kickStart script and added the cleanup
command to the run.bash.
Also, changed user interface message in PumpHandler.