removing references to comment count