Remove some dead code.

Change-Id: Ie148b506eb6037a0f44d976a2b53e4bf7e64e212
"go fmt" fixup.

Change-Id: I262bb462281bc2610819c822fc7a0768c6ce3d8d