There are couple of static strings introduced for DVR configuration such as the L3 agent mode. This patch would clean up the static strings with the labels. Closes-Bug: #1411351 Change-Id: I143262e62ee994e6c01d63e4ea7d5f6292de8286