Revert "Some general cleanup, adding a --verbose option, etc."

This reverts commit 099d71ad5c071afc93dd667accecee4bf6c36bbc.