Clean up of dead code, imports, and unused variables

[Mike Kienenberger]

I hope no one has an issue with me going through the code and removing
all of the dead code, unused variables, and unused imports.   If so,
let me know, and I'll revert the commit.