Remove some really old and crufty commented-out code...