diff --git a/lib/cisco_node_utils/dhcp_relay_global.rb b/lib/cisco_node_utils/dhcp_relay_global.rb
index 89017a7c..e5fb8365 100644
--- a/lib/cisco_node_utils/dhcp_relay_global.rb
+++ b/lib/cisco_node_utils/dhcp_relay_global.rb
@@ -172,7 +172,6 @@ def default_ipv4_src_addr_hsrp
 
     def ipv4_src_intf
       intf = config_get('dhcp_relay_global', 'ipv4_src_intf')
-      # Normalize by downcasing and removing white space
       intf = intf.downcase.delete(' ') if intf
       intf
     end
@@ -207,10 +206,7 @@ def default_ipv4_sub_option_circuit_id_custom
     def ipv4_sub_option_circuit_id_string
       str = config_get('dhcp_relay_global', 'ipv4_sub_option_circuit_id_string')
       # Normalize by removing white space and add quotes
-      if str
-        str.strip!
-        str = Utils.add_quotes(str)
-      end
+      str.strip! if str.kind_of?(String)
       str
     end