#458 - Remove contact info labels when empty