Some forgotten and vestigial cleanup.