Minor cleanup.
Remove swap. It hasn't worked in ages, and is implemented the wrong way anyway.
Remove the old confirm/log proof stuff which probably doesn't work anymore.