diff --git a/voice-client/files/etc/asterisk_templates/brcm.conf.TEMPLATE b/voice-client/files/etc/asterisk_templates/brcm.conf.TEMPLATE
index 5e998b6aa..7e71bcdcd 100644
--- a/voice-client/files/etc/asterisk_templates/brcm.conf.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/brcm.conf.TEMPLATE
@@ -11,12 +11,6 @@
 ; With one call active, press R, dial a new number and wait for ringback. Then hangup to do a remote connect.
 hangup_xfer=yes
 
-; Country, determines dialtone and other country-specific parameters.
-; This is a global setting.
-; Available values are:
-; AUS, BEL, BRA, CHL, CHN, CZE, DNK, ETS, FIN, FRA, DEU, HUN, IND, ITA, JPN, NLD, NZL, USA, ESP, SWE, CHE, NOR, TWN, GBR, ARE
-;country=|COUNTRY|
-
 ; Enables the use of a jitterbuffer on the receiving side of a SIP channel. [yes/no] (Added in Version 1.4)
 ; This is a global setting.
 jbenable = |JBENABLE|
@@ -44,37 +38,12 @@ context=default
 ; When an exact match is found in this context, interdigit timeout is ignored and call is immediately initiated
 context_direct=default-direct
 
-; Echo Cancellation [off, on]
-;echocancel=on
-
-; Voice Activity Detection
-; 0 = VAD off
-; 1 = Transparent VAD
-; 2 = Conservative VAD
-; 3 = Aggressive VAD
-;silence=0
-
-; TX Gain value between -96 and 32 dB
-;txgain=0
-
-; RX Gain value between -96 and 32 dB
-;rxgain=0
-
-; Codec settings, can be specified multiple times to allow more codecs
-; Available values are: alaw, ulaw, g723, g726, g729
-;allow = ulaw
-;allow = alaw
-
 ; Enable/Disable ring signal [off, on]
 ringsignal=on
 
 ; Inter-digit timeout, milliseconds
 dialoutmsec=|DIALOUTMSEC|
 
-; Specify packetization rate
-; Available values are: 5, 10, 20, 30, 40
-;period=20
-
 ; Comfort Noise Generation
 ; 0 = CNG off
 ; 1 = White noise
@@ -94,8 +63,4 @@ featureaccesscodes = |FAC|
 ; Unused/undocumented settings, do not uncomment/change these
 ;
 ;language=
-;jitter_fixed=0
-;jitter_min=0
-;jitter_max=0
-;jitter_target=0
 
diff --git a/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE b/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE
index aeacc7cb5..1dbc07b3c 100644
--- a/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/brcm_line.TEMPLATE
@@ -4,20 +4,10 @@ callerid=|CALLERID|
 autodial=|AUTODIAL|
 autodial_timeoutmsec=|AUTODIAL_TIMEOUT|
 dialtone_timeoutmsec=|DIALTONE_TIMEOUT|
-;jitter_fixed=|JITTERFIXED|
-;jitter_min=|JITTERMIN|
-;jitter_max=|JITTERMAX|
-;jitter_target=|JITTERTARGET|
-;txgain=|TXGAIN|
-;rxgain=|RXGAIN|
-;comfortnoise=|COMFORTNOISE|
-;echocancel=|ECHOCANCEL|
-;silence=|SILENCE|
 context=|CONTEXT|
 context_direct=|CONTEXT|-direct
 dialtone_extension_hint_context=brcm_dialtone
 dialtone_extension_hint=|DIALTONE_EXTENSION_HINT|
-;period=20
 callwaiting=|CALLWAITING|
 clir=|CLIR|
 dtmfrelay=|DTMFRELAY|
diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client
index b4b7031f5..b4db39b18 100755
--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -1834,7 +1834,6 @@ configure_codecs()
 configure_brcm()
 {
 	echo "Configuring BRCM"
-	local country
 	local jbenable
 	local jbforce
 	local jbmaxsize
@@ -1843,8 +1842,6 @@ configure_brcm()
 	local dialoutmsec
 	local fac
 
-#	config_get country BRCM country
-country=""
 	config_get jbenable BRCM jbenable
 	config_get jbforce BRCM jbforce
 	config_get jbmaxsize BRCM jbmaxsize
@@ -1861,7 +1858,6 @@ country=""
 		dialoutmsec=4000
 	fi
 
-	sed -i "s/|COUNTRY|/$country/"				$WORKDIR/brcm.tmp
 	sed -i "s/|JBENABLE|/$jbenable/"			$WORKDIR/brcm.tmp
 	sed -i "s/|JBFORCE|/$jbforce/"				$WORKDIR/brcm.tmp
 	sed -i "s/|JBMAXSIZE|/$jbmaxsize/"			$WORKDIR/brcm.tmp
@@ -1885,16 +1881,6 @@ configure_brcm_line()
 	echo "Configuring BRCM line $1"
 	local extension
 	local sip_provider
-	local ptime
-	local silence
-	local ecan
-	local noise
-	local jitter_fixed
-	local jitter_min
-	local jitter_max
-	local jitter_target
-	local txgain
-	local rxgain
 	local codecs
 	local is_fax
 	local autodial
@@ -1907,26 +1893,6 @@ configure_brcm_line()
 
 	config_get extension $1 extension
 	config_get sip_provider $1 sip_account
-#	config_get ptime $1 ptime
-ptime=0
-#	config_get silence $1 vad
-vad=0
-#	config_get ecan $1 echo_cancel
-echo_cancel=0
-#	config_get noise $1 noise
-noise=0
-#	config_get jitter_fixed $1 jitter_fixed
-jitter_fixed=0
-#	config_get jitter_min $1 jitter_min
-jitter_min=0
-#	config_get jitter_max $1 jitter_max
-jitter_max=0
-#	config_get jitter_target $1 jitter_target
-jitter_target=0
-#	config_get txgain $1 txgain
-txgain=0
-#	config_get rxgain $1 rxgain
-rxgain=0
 	config_get autodial $1 autodial
 	config_get autodial_timeout $1 autodial_timeout
 	config_get dialtone_timeout $1 dialtone_timeout
@@ -1962,16 +1928,6 @@ rxgain=0
 	sed -i "s/|SECTION|/$1/"				$WORKDIR/brcm_line.tmp
 	sed -i "s/|CALLERID|/$extension/g"			$WORKDIR/brcm_line.tmp
 	sed -i "s/|CONTEXT|/$sip_provider/g"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|PERIOD|/$ptime/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|SILENCE|/$silence/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|ECHOCANCEL|/$ecan/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|COMFORTNOISE|/$noise/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERFIXED|/$jitter_fixed/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERMIN|/$jitter_min/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERMAX|/$jitter_max/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|JITTERTARGET|/$jitter_target/"		$WORKDIR/brcm_line.tmp
-	sed -i "s/|TXGAIN|/$txgain/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|RXGAIN|/$rxgain/"				$WORKDIR/brcm_line.tmp
 	sed -i "s/|DIALTONE_EXTENSION_HINT|/$1/"		$WORKDIR/brcm_line.tmp
 	sed -i "s/|AUTODIAL|/$autodial/"			$WORKDIR/brcm_line.tmp
 	sed -i "s/|AUTODIAL_TIMEOUT|/$autodial_timeout/"	$WORKDIR/brcm_line.tmp