Remove a bunch of dead code: gcc 4.7 warns of set-but-unused
variables.  So get rid of them.