Remove some dead code.
Re-enable a crypto benchmark.