Patch inspired by one from James H: remove spurious references to