Remove code superseded by the pre- and post-verify switches.

Change-Id: Iacd45b8b0f64a4e215011b865f57df75c4a08981
2 files changed