The corresponding definitions were removed in 7dcbe3d3 and 2a8fa2a8. Also remove a couple of variables made dead by those changes.
