CLN: remove vestigial count code
Merge pull request #6480 from dsm054/remove_vestigial_count

CLN: remove vestigial count code