ref #8205 clening up: removing duplicate application of the ReferenceEllypsisCaptionGenerator and minor cleaning
ref #8205 clening up: removing duplicate application of the ReferenceEllypsisCaptionGenerator and minor cleaning