Cleanup:  Removed unneeded variables and a debug variable.