3.1.23

Minor cleanup.