Merge "Remove some historical cruft." into main