Removing dead code, thanks to new OCaml warnings and a bit of scripting.