More clean-up of old annotations