diff --git a/autoload_configs/cepstral.conf.xml b/autoload_configs/cepstral.conf.xml
deleted file mode 100644
index cf4aa92..0000000
--- a/autoload_configs/cepstral.conf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration name="cepstral.conf" description="Cepstral TTS configuration">
-  <settings>
-    <!--
-        Possible encodings:
-        * utf-8
-        * us-ascii
-        * iso8859-1 (default)
-        * iso8859-15
-    -->
-    <param name="encoding" value="utf-8"/>
-  </settings>
-</configuration>
\ No newline at end of file
diff --git a/autoload_configs/conference.conf.xml b/autoload_configs/conference.conf.xml
deleted file mode 100644
index c1831ae..0000000
--- a/autoload_configs/conference.conf.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<configuration name="conference.conf" description="Audio Conference">
-    <caller-controls/>
-
-    <profiles>
-        <profile name="default">
-            <param name="rate" value="16000"/>
-            <param name="interval" value="20"/>
-            <param name="energy-level" value="20"/>
-            <!--<param name="member-flags" value="waste"/>-->
-            <param name="caller-controls" value="none"/>
-            <param name="sound-prefix" value=""/>
-            <param name="ack-sound" value=""/>
-            <param name="nack-sound" value=""/>
-            <param name="muted-sound" value=""/>
-            <param name="unmuted-sound" value=""/>
-            <param name="alone-sound" value=""/>
-            <param name="perpetual-sound" value=""/>
-            <param name="moh-sound" value=""/>
-            <param name="enter-sound" value=""/>
-            <param name="exit-sound" value=""/>
-            <param name="kicked-sound" value=""/>
-            <param name="locked-sound" value=""/>
-            <param name="is-locked-sound" value=""/>
-            <param name="is-unlocked-sound" value=""/>
-            <param name="pin-sound" value=""/>
-            <param name="bad-pin-sound" value=""/>
-            <param name="caller-id-name" value="Unknown"/>
-            <param name="caller-id-number" value="5555555555"/>
-            <!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
-            <param name="comfort-noise" value="true"/>
-        </profile>
-
-    </profiles>
-</configuration>
diff --git a/autoload_configs/console.conf.xml b/autoload_configs/console.conf.xml
deleted file mode 100644
index 287f4fa..0000000
--- a/autoload_configs/console.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<configuration name="console.conf" description="Console Logger">
-    <settings>
-        <param name="colorize" value="true"/>
-        <param name="loglevel" value="info"/>
-    </settings>
-
-    <mappings>
-        <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
-    </mappings>
-</configuration>
diff --git a/autoload_configs/event_socket.conf.xml b/autoload_configs/event_socket.conf.xml
deleted file mode 100644
index 0994506..0000000
--- a/autoload_configs/event_socket.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<configuration name="event_socket.conf" description="Socket Client">
-    <settings>
-        <param name="nat-map" value="false"/>
-        <param name="listen-ip" value="127.0.0.1"/>
-        <param name="listen-port" value="8021"/>
-        <!--<param name="password" value="v01pdomiNATION"/>-->
-        <!--<param name="apply-inbound-acl" value="lan"/>-->
-    </settings>
-</configuration>
diff --git a/autoload_configs/httapi.conf.xml b/autoload_configs/httapi.conf.xml
deleted file mode 100644
index 50bbe78..0000000
--- a/autoload_configs/httapi.conf.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<configuration name="httapi.conf" description="HT-TAPI Hypertext Telephony API">
-  <settings>
-    <!-- print xml on the consol -->
-    <param name="debug" value="true"/>
-    <!-- time to keep audio files when discoverd they were deleted from the http server -->
-    <param name="file-not-found-expires" value="300"/>
-    <!-- how often to re-check the server to make sure the remote file has not changed -->
-    <param name="file-cache-ttl" value="300"/>
-  </settings>
-  <profiles>
-    <profile name="default">
-
-      <!-- default params for conference action tags -->
-      <conference>
-	<param name="default-profile" value="default"/>
-      </conference>
-
-      <!-- default params for dial action tags -->
-      <dial>
-	<param name="context" value="default"/>
-	<param name="dialplan" value="XML"/>
-      </dial>
-
-      <!-- permissions -->
-      <permissions>
-	<!-- <permission name="all" value="true"/> -->
-	<!--<permission name="none" value="true"/> -->
-	<permission name="set-params" value="true"/>
-	<permission name="set-vars" value="false">
-	  <!-- default to "deny" or "allow" -->
-	  <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
-	  <!-- 
-	  <variable-list default="deny">
-	    <variable name="caller_id_name"/>
-	    <variable name="hangup"/> 
-	  </variable-list>
-	  -->
-	</permission>
-	<permission name="get-vars" value="false">
-	  <!-- default to "deny" or "allow" -->
-	  <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
-	  <!-- 
-	  <variable-list default="deny">
-	    <variable name="caller_id_name"/>
-	    <variable name="hangup"/> 
-	  </variable-list>
-	  -->
-	</permission>
-	<permission name="extended-data" value="false"/>
-	<permission name="execute-apps" value="true">
-	  <!-- default to "deny" or "allow" -->
-	  <application-list default="deny">
-	    <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
-	    <application name="info"/>
-	    <application name="hangup"/>
-	  </application-list>
-	</permission>
-	<permission name="expand-vars-in-tag-body" value="false">
-	  <!-- default to "deny" or "allow" -->
-	  <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
-	  <!-- 
-	  <variable-list default="deny">
-	    <variable name="caller_id_name"/>
-	    <variable name="hangup"/> 
-	  </variable-list>
-
-	  <api-list default="deny">
-	    <api name="expr"/>
-	    <api name="lua"/> 
-	  </api-list>
-	  -->
-	</permission>
-	<permission name="dial" value="true"/>
-	<permission name="dial-set-context" value="false"/>
-	<permission name="dial-set-dialplan" value="false"/>
-	<permission name="dial-set-cid-name" value="false"/>
-	<permission name="dial-set-cid-number" value="false"/>
-	<permission name="dial-full-originate" value="false"/>
-	<permission name="conference" value="true"/>
-	<permission name="conference-set-profile" value="false"/>
-      </permissions>
-      
-      <params>
-	<!-- default url can be overridden by app data -->
-	<param name="gateway-url" value="http://www.freeswitch.org/api/index.cgi" />
-	
-	<!-- set this to provide authentication credentials to the server -->
-	<!--<param name="gateway-credentials" value="muser:mypass"/>-->
-	<!--<param name="auth-scheme" value="basic"/>-->
-
-	<!-- optional: this will enable the CA root certificate check by libcurl to
-	     verify that the certificate was issued by a major Certificate Authority.
-	     note: default value is disabled. only enable if you want this! -->
-	<!--<param name="enable-cacert-check" value="true"/>-->
-	<!-- optional: verify that the server is actually the one listed in the cert -->
-	<!-- <param name="enable-ssl-verifyhost" value="true"/> -->
-
-	<!-- optional: these options can be used to specify custom SSL certificates
-	     to use for HTTPS communications. Either use both options or neither.
-	     Specify your public key with 'ssl-cert-path' and the private key with
-	     'ssl-key-path'. If your private key has a password, specify it with
-	     'ssl-key-password'. -->
-	<!-- <param name="ssl-cert-path" value="$${base_dir}/conf/certs/public_key.pem"/> -->
-	<!-- <param name="ssl-key-path" value="$${base_dir}/conf/certs/private_key.pem"/> -->
-	<!-- <param name="ssl-key-password" value="MyPrivateKeyPassword"/> -->
-	<!-- optional timeout -->
-	<!-- <param name="timeout" value="10"/> -->
-
-	<!-- optional: use a custom CA certificate in PEM format to verify the peer
-	     with. This is useful if you are acting as your own certificate authority.
-	     note: only makes sense if used in combination with "enable-cacert-check." -->
-	<!-- <param name="ssl-cacert-file" value="$${base_dir}/conf/certs/cacert.pem"/> -->
-
-	<!-- optional: specify the SSL version to force HTTPS to use. Valid options are
-	     "SSLv3" and "TLSv1". Otherwise libcurl will auto-negotiate the version. -->
-	<!-- <param name="ssl-version" value="TLSv1"/> -->
-
-	<!-- optional: enables cookies and stores them in the specified file. -->
-	<!-- <param name="cookie-file" value="/tmp/cookie-mod_xml_curl.txt"/> -->
-
-	<!-- one or more of these imply you want to pick the exact variables that are transmitted -->
-	<!--<param name="enable-post-var" value="Caller-Unique-ID"/>-->
-      </params>
-
-    </profile>
-  </profiles>
-</configuration>
diff --git a/autoload_configs/http_cache.conf.xml b/autoload_configs/http_cache.conf.xml
deleted file mode 100644
index 4d1864b..0000000
--- a/autoload_configs/http_cache.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<configuration name="http_cache.conf" description="HTTP GET cache">
-  <settings>
-    <param name="max-urls" value="10000"/>
-    <param name="location" value="$${base_dir}/share/freeswitch/http_cache"/>
-    <param name="default-max-age" value="86400"/>
-    <param name="prefetch-thread-count" value="8"/>
-    <param name="prefetch-queue-size" value="100"/>
-  </settings>
-</configuration>
diff --git a/autoload_configs/kazoo.conf.xml b/autoload_configs/kazoo.conf.xml
deleted file mode 100644
index 547e725..0000000
--- a/autoload_configs/kazoo.conf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration name="kazoo.conf" description="Kazoo Erlang Socket Client">
-    <settings>
-        <param name="listen-ip" value="0.0.0.0"/>
-        <param name="listen-port" value="8031"/>
-        <param name="cookie-file" value="/etc/freeswitch/autoload_configs/.erlang.cookie" />
-        <param name="shortname" value="false"/>
-        <param name="nodename" value="freeswitch@fs01a.5060.io" />
-        <!--<param name="apply-inbound-acl" value="lan"/>-->
-        <param name="encoding" value="binary"/>
-        <!--<param name="compat-rel" value="12"/> -->
-    </settings>
-</configuration>
\ No newline at end of file
diff --git a/autoload_configs/local_stream.conf.xml b/autoload_configs/local_stream.conf.xml
deleted file mode 100644
index 75dfb94..0000000
--- a/autoload_configs/local_stream.conf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration name="local_stream.conf" description="stream files from local dir">
-
-    <directory name="default" path="$${sounds_dir}/music/8000">
-        <param name="rate" value="8000"/>
-        <param name="shuffle" value="true"/>
-        <param name="channels" value="1"/>
-        <param name="interval" value="20"/>
-        <param name="timer-name" value="soft"/>
-        <!--<param name="chime-list" value="$${sounds_dir}/music/8000/chime1.wav"/>-->
-        <!--<param name="chime-freq" value="30"/>-->
-        <!--<param name="chime-max" value="500"/>-->
-    </directory>
-
-</configuration>
diff --git a/autoload_configs/logfile.conf.xml b/autoload_configs/logfile.conf.xml
deleted file mode 100644
index 35e8ba5..0000000
--- a/autoload_configs/logfile.conf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<configuration name="logfile.conf" description="File Logging">
-    <settings>
-        <param name="rotate-on-hup" value="true"/>
-    </settings>
-
-    <profiles>
-        <profile name="debug">
-            <settings>
-                <param name="logfile" value="/var/log/freeswitch/debug.log"/>
-                <param name="rollover" value="0"/>
-                <param name="uuid" value="true" />
-            </settings>
-            <mappings>
-                <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
-            </mappings>
-        </profile>
-
-        <profile name="error">
-            <settings>
-                <param name="logfile" value="/var/log/freeswitch/error.log"/>
-                <param name="rollover" value="0"/>
-                <param name="uuid" value="true" />
-            </settings>
-            <mappings>
-                <map name="all" value="warning,err,crit,alert"/>
-            </mappings>
-        </profile>
-    </profiles>
-</configuration>
diff --git a/autoload_configs/modules.conf.xml b/autoload_configs/modules.conf.xml
deleted file mode 100644
index 8dc91db..0000000
--- a/autoload_configs/modules.conf.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<configuration name="modules.conf" description="Modules">
-    <modules>
-        <!-- Loggers -->
-        <load module="mod_console"/>
-        <load module="mod_logfile"/>
-        <!--<load module="mod_syslog"/>-->
-
-        <!-- XML Interfaces -->
-
-        <!-- Event Handlers -->
-        <load module="mod_event_socket"/>
-        <load module="mod_kazoo" />
-
-        <!-- Directory Interfaces -->
-        <load module="mod_dialplan_xml"/>
-
-        <!-- Endpoints -->
-        <!-- NOTE: mod_sofia should not be loaded here. It will be loaded by eCallMgr when we're ready to receive calls -->
-        <load module="mod_loopback"/>
-
-        <!-- Applications -->
-        <load module="mod_commands"/>
-        <load module="mod_conference"/>
-        <load module="mod_dptools"/>
-        <load module="mod_expr"/>
-        <load module="mod_http_cache"/>
-
-        <!-- Codec Interfaces -->
-        <load module="mod_spandsp"/>
-        <load module="mod_siren"/>
-	<load module="mod_com_g729"/>
-        <load module="mod_g723_1"/>
-        <load module="mod_amr"/>
-        <load module="mod_ilbc"/>
-        <load module="mod_speex"/>
-        <load module="mod_h26x"/>
-        <load module="mod_celt"/>
-        <load module="mod_opus"/>
-
-        <!-- File Format Interfaces -->
-        <load module="mod_sndfile"/>
-        <!--<load module="mod_native_file"/>-->
-        <load module="mod_local_stream"/>
-        <load module="mod_tone_stream"/>
-        <load module="mod_shout"/>
-
-        <!-- Timers -->
-
-        <!-- Languages -->
-
-        <!-- ASR /TTS -->
-        <load module="mod_flite"/>
-
-        <!-- Say -->
-        <load module="mod_say_en"/>
-
-        <!-- Third party modules -->
-        
-    </modules>
-</configuration>
diff --git a/autoload_configs/post_load_modules.conf.xml b/autoload_configs/post_load_modules.conf.xml
deleted file mode 100644
index 186e454..0000000
--- a/autoload_configs/post_load_modules.conf.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration name="post_load_modules.conf" description="Modules">
-    <modules>
-    </modules>
-</configuration>
diff --git a/autoload_configs/shout.conf.xml b/autoload_configs/shout.conf.xml
deleted file mode 100644
index a90bebf..0000000
--- a/autoload_configs/shout.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration name="shout.conf" description="mod shout config">
-  <settings>
-    <!-- Don't change these unless you are insane -->
-    <!--<param name="decoder" value="i586"/>-->
-    <param name="volume" value="1"/>
-    <!--<param name="outscale" value="8192"/>-->
-  </settings>
-</configuration>
diff --git a/autoload_configs/sofia.conf.xml b/autoload_configs/sofia.conf.xml
deleted file mode 100644
index b1339fd..0000000
--- a/autoload_configs/sofia.conf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration name="sofia.conf" description="sofia Endpoint">    
-    <global_settings>        
-        <param name="log-level" value="info"/>
-        <param name="tracelevel" value="debug"/>
-        <param name="debug-presence" value="0"/>
-        <param name="debug-sla" value="0"/>
-        <param name="auto-restart" value="false"/>
-        <!--<param name="rewrite-multicasted-fs-path" value="to_host"/>-->
-    </global_settings>
-    
-    <profiles>
-        <X-PRE-PROCESS cmd="include" data="../sip_profiles/*.xml"/>
-    </profiles>
-</configuration>
diff --git a/autoload_configs/spandsp.conf.xml b/autoload_configs/spandsp.conf.xml
deleted file mode 100644
index 849d662..0000000
--- a/autoload_configs/spandsp.conf.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<configuration name="spandsp.conf" description="Tone detector descriptors">
-    <settings>
-        <param name="use-ecm"           value="true"/>
-        <param name="verbose"           value="false"/>
-        <param name="disable-v17"       value="false"/>
-        <param name="ident"             value="Fax Machine"/>
-        <param name="header"            value="Fax Machine"/>
-        <param name="enable-t38"        value="true"/>
-        <param name="enable-t38-request"        value="true"/>
-
-        <param name="spool-dir"         value="/tmp"/>
-        <param name="file-prefix"       value="faxrx"/>
-    </settings>
-   <descriptors>
-
-     <!-- North America -->
-     <descriptor name="1">
-       <tone name="CED_TONE">
-         <element freq1="2100" freq2="0" min="500" max="0"/>
-       </tone>
-       <tone name="SIT">
-         <element freq1="950" freq2="0" min="256" max="400"/>
-         <element freq1="1400" freq2="0" min="256" max="400"/>
-         <element freq1="1800" freq2="0" min="256" max="400"/>
-       </tone>
-       <tone name="REORDER_TONE">
-         <element freq1="480" freq2="620" min="224" max="272"/>
-         <element freq1="0" freq2="0" min="224" max="272"/>
-       </tone>
-       <tone name="BUSY_TONE">
-         <element freq1="480" freq2="620" min="464" max="516"/>
-         <element freq1="0" freq2="0" min="464" max="516"/>
-       </tone>
-     </descriptor>
-
-     <!-- United Kingdom -->
-     <descriptor name="44">
-       <tone name="CED_TONE">
-         <element freq1="2100" freq2="0" min="500" max="0"/>
-       </tone>
-       <tone name="SIT">
-         <element freq1="950" freq2="0" min="256" max="400"/>
-         <element freq1="1400" freq2="0" min="256" max="400"/>
-         <element freq1="1800" freq2="0" min="256" max="400"/>
-       </tone>
-       <tone name="REORDER_TONE">
-         <element freq1="400" freq2="0" min="368" max="416"/>
-         <element freq1="0" freq2="0" min="336" max="368"/>
-         <element freq1="400" freq2="0" min="256" max="288"/>
-         <element freq1="0" freq2="0" min="512" max="544"/>
-       </tone>
-       <tone name="BUSY_TONE">
-         <element freq1="400" freq2="0" min="352" max="384"/>
-         <element freq1="0" freq2="0" min="352" max="384"/>
-         <element freq1="400" freq2="0" min="352" max="384"/>
-         <element freq1="0" freq2="0" min="352" max="384"/>
-       </tone>
-     </descriptor>
-
-     <!-- Germany -->
-     <descriptor name="49">
-       <tone name="CED_TONE">
-         <element freq1="2100" freq2="0" min="500" max="0"/>
-       </tone>
-       <tone name="SIT">
-         <element freq1="900" freq2="0" min="256" max="400"/>
-         <element freq1="1400" freq2="0" min="256" max="400"/>
-         <element freq1="1800" freq2="0" min="256" max="400"/>
-       </tone>
-       <tone name="REORDER_TONE">
-         <element freq1="425" freq2="0" min="224" max="272"/>
-         <element freq1="0" freq2="0" min="224" max="272"/>
-       </tone>
-       <tone name="BUSY_TONE">
-         <element freq1="425" freq2="0" min="464" max="516"/>
-         <element freq1="0" freq2="0" min="464" max="516"/>
-       </tone>
-     </descriptor>
-   </descriptors>
-</configuration>
diff --git a/autoload_configs/switch.conf.xml b/autoload_configs/switch.conf.xml
deleted file mode 100644
index ed7710c..0000000
--- a/autoload_configs/switch.conf.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<configuration name="switch.conf" description="Core Configuration">
-
-    <cli-keybindings>
-        <key name="1" value="help"/>
-        <key name="2" value="status"/>
-        <key name="3" value="show channels"/>
-        <key name="4" value="show calls"/>
-        <key name="5" value="sofia status"/>
-        <key name="6" value="reloadxml"/>
-        <key name="7" value="console loglevel 0"/>
-        <key name="8" value="console loglevel 7"/>
-        <key name="9" value="sofia status profile internal"/>
-        <key name="10" value="sofia profile internal siptrace on"/>
-        <key name="11" value="sofia profile internal siptrace off"/>
-        <key name="12" value="version"/>
-    </cli-keybindings> 
-
-    <settings>
-        <param name="max-db-handles" value="50"/>
-        <param name="db-handle-timeout" value="10"/>
-        <param name="loglevel" value="debug"/>
-        <param name="dump-cores" value="yes"/>
-        <!--<param name="debug-level" value="1"/>-->
-        <!--<param name="sql-buffer-len" value="1"/>-->
-        <!--<param name="max-sql-buffer-len" value="1"/>-->
-        <param name="auto-create-schemas" value="true"/>
-        <!--<param name="enable-early-hangup" value="true"/>-->
-        <param name="colorize-console" value="true"/>
-        <param name="mailer-app" value="sendmail"/>
-        <param name="mailer-app-args" value="-t"/>
-        <param name="max-sessions" value="5000"/>
-        <param name="sessions-per-second" value="200"/>
-        <param name="max-dtmf-duration" value="2000"/>
-        <param name="min-dtmf-duration" value="200"/>
-        <param name="default-dtmf-duration" value="1000"/>
-        <!--<param name="enable-monotonic-timing" value="true"/>-->
-        <!--<param name="enable-clock-nanosleep" value="true"/>-->
-        <!--<param name="enable-cond-yield" value="true"/>-->
-        <!--<param name="enable-timer-matrix" value="true"/>-->
-        <!--<param name="verbose-channel-events" value="true"/>-->
-        <!--<param name="min-idle-cpu" value="15"/>-->
-        <!--<param name="tipping-point" value="15"/>-->
-        <!--<param name="timer-affinity" value="disabled"/>-->
-        <param name="rtp-start-port" value="16384"/>
-        <param name="rtp-end-port" value="32768"/>
-        <param name="rtp-enable-zrtp" value="true"/>
-        <!--<param name="core-db-dsn" value="fs_core"/>-->
-        <!--<param name="core-dbtype" value="MSSQL"/>-->
-    </settings>
-</configuration>
diff --git a/autoload_configs/syslog.conf.xml b/autoload_configs/syslog.conf.xml
deleted file mode 100644
index eb090d3..0000000
--- a/autoload_configs/syslog.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration name="syslog.conf" description="Syslog Logger">
-    <settings>
-        <param name="facility" value="local1"/>
-        <param name="ident" value="freeswitch"/>
-        <param name="loglevel" value="debug"/>
-        <param name="uuid" value="true"/>
-    </settings>
-</configuration>
diff --git a/autoload_configs/timezones.conf.xml b/autoload_configs/timezones.conf.xml
deleted file mode 100644
index 85c805f..0000000
--- a/autoload_configs/timezones.conf.xml
+++ /dev/null
@@ -1,551 +0,0 @@
-<configuration name="timezones.conf" description="Timezones">
-    <timezones>
-	<zone name="Africa/Abidjan" value="GMT0" />
-	<zone name="Africa/Accra" value="GMT0" />
-	<zone name="Africa/Addis_Ababa" value="EAT-3" />
-	<zone name="Africa/Algiers" value="CET-1" />
-	<zone name="Africa/Asmara" value="EAT-3" />
-	<zone name="Africa/Asmera" value="EAT-3" />
-	<zone name="Africa/Bamako" value="GMT0" />
-	<zone name="Africa/Bangui" value="WAT-1" />
-	<zone name="Africa/Banjul" value="GMT0" />
-	<zone name="Africa/Bissau" value="GMT0" />
-	<zone name="Africa/Blantyre" value="CAT-2" />
-	<zone name="Africa/Brazzaville" value="WAT-1" />
-	<zone name="Africa/Bujumbura" value="CAT-2" />
-	<zone name="Africa/Cairo" value="EEST" />
-	<zone name="Africa/Casablanca" value="WET0" />
-	<zone name="Africa/Ceuta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Conakry" value="GMT0" />
-	<zone name="Africa/Dakar" value="GMT0" />
-	<zone name="Africa/Dar_es_Salaam" value="EAT-3" />
-	<zone name="Africa/Djibouti" value="EAT-3" />
-	<zone name="Africa/Douala" value="WAT-1" />
-	<zone name="Africa/El_Aaiun" value="WET0" />
-	<zone name="Africa/Freetown" value="GMT0" />
-	<zone name="Africa/Gaborone" value="CAT-2" />
-	<zone name="Africa/Harare" value="CAT-2" />
-	<zone name="Africa/Johannesburg" value="SAST-2" />
-	<zone name="Africa/Kampala" value="EAT-3" />
-	<zone name="Africa/Khartoum" value="EAT-3" />
-	<zone name="Africa/Kigali" value="CAT-2" />
-	<zone name="Africa/Kinshasa" value="WAT-1" />
-	<zone name="Africa/Lagos" value="WAT-1" />
-	<zone name="Africa/Libreville" value="WAT-1" />
-	<zone name="Africa/Lome" value="GMT0" />
-	<zone name="Africa/Luanda" value="WAT-1" />
-	<zone name="Africa/Lubumbashi" value="CAT-2" />
-	<zone name="Africa/Lusaka" value="CAT-2" />
-	<zone name="Africa/Malabo" value="WAT-1" />
-	<zone name="Africa/Maputo" value="CAT-2" />
-	<zone name="Africa/Maseru" value="SAST-2" />
-	<zone name="Africa/Mbabane" value="SAST-2" />
-	<zone name="Africa/Mogadishu" value="EAT-3" />
-	<zone name="Africa/Monrovia" value="GMT0" />
-	<zone name="Africa/Nairobi" value="EAT-3" />
-	<zone name="Africa/Ndjamena" value="WAT-1" />
-	<zone name="Africa/Niamey" value="WAT-1" />
-	<zone name="Africa/Nouakchott" value="GMT0" />
-	<zone name="Africa/Ouagadougou" value="GMT0" />
-	<zone name="Africa/Porto-Novo" value="WAT-1" />
-	<zone name="Africa/Sao_Tome" value="GMT0" />
-	<zone name="Africa/Timbuktu" value="GMT0" />
-	<zone name="Africa/Tripoli" value="EET-2" />
-	<zone name="Africa/Tunis" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Africa/Windhoek" value="WAT-1WAST,M9.1.0,M4.1.0" />
-
-	<zone name="America/Adak" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Anchorage" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Anguilla" value="AST4" />
-	<zone name="America/Antigua" value="AST4" />
-	<zone name="America/Araguaina" value="BRT3" />
-	<zone name="America/Argentina/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/ComodRivadavia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/La_Rioja" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Rio_Gallegos" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Juan" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/San_Luis" value="ART3" />
-	<zone name="America/Argentina/Tucuman" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Argentina/Ushuaia" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Aruba" value="AST4" />
-	<zone name="America/Asuncion" value="PYT4PYST,M10.3.0/0,M3.2.0/0" />
-	<zone name="America/Atikokan" value="EST5" />
-	<zone name="America/Atka" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="America/Bahia" value="BRT3" />
-	<zone name="America/Barbados" value="AST4" />
-	<zone name="America/Belem" value="BRT3" />
-	<zone name="America/Belize" value="CST6" />
-	<zone name="America/Blanc-Sablon" value="AST4" />
-	<zone name="America/Boa_Vista" value="AMT4" />
-	<zone name="America/Bogota" value="COT5" />
-	<zone name="America/Boise" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Buenos_Aires" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cambridge_Bay" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Campo_Grande" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Cancun" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Caracas" value="VET4:30" />
-	<zone name="America/Catamarca" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Cayenne" value="GFT3" />
-	<zone name="America/Cayman" value="EST5" />
-	<zone name="America/Chicago" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Chihuahua" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Coral_Harbour" value="EST5" />
-	<zone name="America/Cordoba" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Costa_Rica" value="CST6" />
-	<zone name="America/Cuiaba" value="AMT4AMST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Curacao" value="AST4" />
-	<zone name="America/Danmarkshavn" value="GMT0" />
-	<zone name="America/Dawson" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dawson_Creek" value="MST7" />
-	<zone name="America/Denver" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Detroit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Dominica" value="AST4" />
-	<zone name="America/Edmonton" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Eirunepe" value="ACT5" />
-	<zone name="America/El_Salvador" value="CST6" />
-	<zone name="America/Ensenada" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Fortaleza" value="BRT3" />
-	<zone name="America/Fort_Wayne" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Glace_Bay" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Godthab" value="WGST" />
-	<zone name="America/Goose_Bay" value="AST4ADT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/Grand_Turk" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Grenada" value="AST4" />
-	<zone name="America/Guadeloupe" value="AST4" />
-	<zone name="America/Guatemala" value="CST6" />
-	<zone name="America/Guayaquil" value="ECT5" />
-	<zone name="America/Guyana" value="GYT4" />
-	<zone name="America/Halifax" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Havana" value="CST5CDT,M3.3.0/0,M10.5.0/1" />
-	<zone name="America/Hermosillo" value="MST7" />
-	<zone name="America/Indiana/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Knox" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Marengo" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Petersburg" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indianapolis" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Tell_City" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vevay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Vincennes" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Indiana/Winamac" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Inuvik" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/Iqaluit" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Jamaica" value="EST5" />
-	<zone name="America/Jujuy" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Juneau" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Kentucky/Monticello" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Knox_IN" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/La_Paz" value="BOT4" />
-	<zone name="America/Lima" value="PET5" />
-	<zone name="America/Los_Angeles" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Louisville" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Maceio" value="BRT3" />
-	<zone name="America/Managua" value="CST6" />
-	<zone name="America/Manaus" value="AMT4" />
-	<zone name="America/Marigot" value="AST4" />
-	<zone name="America/Martinique" value="AST4" />
-	<zone name="America/Mazatlan" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mendoza" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Menominee" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Merida" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Mexico_City" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Miquelon" value="PMST3PMDT,M3.2.0,M11.1.0" />
-	<zone name="America/Moncton" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Monterrey" value="CST6CDT,M4.1.0,M10.5.0" />
-	<zone name="America/Montevideo" value="UYT3UYST,M10.1.0,M3.2.0" />
-	<zone name="America/Montreal" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Montserrat" value="AST4" />
-	<zone name="America/Nassau" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/New_York" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nipigon" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Nome" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Noronha" value="FNT2" />
-	<zone name="America/North_Dakota/Center" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/North_Dakota/New_Salem" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Panama" value="EST5" />
-	<zone name="America/Pangnirtung" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Paramaribo" value="SRT3" />
-	<zone name="America/Phoenix" value="MST7" />
-	<zone name="America/Port-au-Prince" value="EST5" />
-	<zone name="America/Porto_Acre" value="ACT5" />
-	<zone name="America/Port_of_Spain" value="AST4" />
-	<zone name="America/Porto_Velho" value="AMT4" />
-	<zone name="America/Puerto_Rico" value="AST4" />
-	<zone name="America/Rainy_River" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Rankin_Inlet" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Recife" value="BRT3" />
-	<zone name="America/Regina" value="CST6" />
-	<zone name="America/Resolute" value="EST5" />
-	<zone name="America/Rio_Branco" value="ACT5" />
-	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
-	<zone name="America/Santiago" value="CLST" />
-	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
-	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
-	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="America/St_Barthelemy" value="AST4" />
-	<zone name="America/St_Johns" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="America/St_Kitts" value="AST4" />
-	<zone name="America/St_Lucia" value="AST4" />
-	<zone name="America/St_Thomas" value="AST4" />
-	<zone name="America/St_Vincent" value="AST4" />
-	<zone name="America/Swift_Current" value="CST6" />
-	<zone name="America/Tegucigalpa" value="CST6" />
-	<zone name="America/Thule" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="America/Thunder_Bay" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tijuana" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="America/Toronto" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="America/Tortola" value="AST4" />
-	<zone name="America/Vancouver" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Virgin" value="AST4" />
-	<zone name="America/Whitehorse" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="America/Winnipeg" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yakutat" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="America/Yellowknife" value="MST7MDT,M3.2.0,M11.1.0" />
-
-	<zone name="Antarctica/Casey" value="WST-8" />
-	<zone name="Antarctica/Davis" value="DAVT-7" />
-	<zone name="Antarctica/DumontDUrville" value="DDUT-10" />
-	<zone name="Antarctica/Mawson" value="MAWT-6" />
-	<zone name="Antarctica/McMurdo" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Palmer" value="CLST" />
-	<zone name="Antarctica/Rothera" value="ROTT3" />
-	<zone name="Antarctica/South_Pole" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Antarctica/Syowa" value="SYOT-3" />
-	<zone name="Antarctica/Vostok" value="VOST-6" />
-
-	<zone name="Arctic/Longyearbyen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Asia/Aden" value="AST-3" />
-	<zone name="Asia/Almaty" value="ALMT-6" />
-	<zone name="Asia/Amman" value="EET-2EEST,M3.5.4/0,M10.5.5/1" />
-	<zone name="Asia/Anadyr" value="ANAT-12ANAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Aqtau" value="AQTT-5" />
-	<zone name="Asia/Aqtobe" value="AQTT-5" />
-	<zone name="Asia/Ashgabat" value="TMT-5" />
-	<zone name="Asia/Ashkhabad" value="TMT-5" />
-	<zone name="Asia/Baghdad" value="AST-3" />
-	<zone name="Asia/Bahrain" value="AST-3" />
-	<zone name="Asia/Baku" value="AZT-4AZST,M3.5.0/4,M10.5.0/5" />
-	<zone name="Asia/Bangkok" value="ICT-7" />
-	<zone name="Asia/Beirut" value="EET-2EEST,M3.5.0/0,M10.5.0/0" />
-	<zone name="Asia/Bishkek" value="KGT-6" />
-	<zone name="Asia/Brunei" value="BNT-8" />
-	<zone name="Asia/Calcutta" value="IST-5:30" />
-	<zone name="Asia/Choibalsan" value="CHOT-9" />
-	<zone name="Asia/Chongqing" value="CST-8" />
-	<zone name="Asia/Chungking" value="CST-8" />
-	<zone name="Asia/Colombo" value="IST-5:30" />
-	<zone name="Asia/Dacca" value="BDT-6" />
-	<zone name="Asia/Damascus" value="EET-2EEST,M4.1.5/0,J274/0" />
-	<zone name="Asia/Dhaka" value="BDT-6" />
-	<zone name="Asia/Dili" value="TLT-9" />
-	<zone name="Asia/Dubai" value="GST-4" />
-	<zone name="Asia/Dushanbe" value="TJT-5" />
-	<zone name="Asia/Gaza" value="EET-2EEST,J91/0,M9.2.4" />
-	<zone name="Asia/Harbin" value="CST-8" />
-	<zone name="Asia/Ho_Chi_Minh" value="ICT-7" />
-	<zone name="Asia/Hong_Kong" value="HKT-8" />
-	<zone name="Asia/Hovd" value="HOVT-7" />
-	<zone name="Asia/Irkutsk" value="IRKT-8IRKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Jakarta" value="WIT-7" />
-	<zone name="Asia/Jayapura" value="EIT-9" />
-	<zone name="Asia/Jerusalem" value="IDDT" />
-	<zone name="Asia/Kabul" value="AFT-4:30" />
-	<zone name="Asia/Kamchatka" value="PETT-12PETST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Karachi" value="PKT-5" />
-	<zone name="Asia/Kashgar" value="CST-8" />
-	<zone name="Asia/Katmandu" value="NPT-5:45" />
-	<zone name="Asia/Kolkata" value="IST-5:30" />
-	<zone name="Asia/Krasnoyarsk" value="KRAT-7KRAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Kuala_Lumpur" value="MYT-8" />
-	<zone name="Asia/Kuching" value="MYT-8" />
-	<zone name="Asia/Kuwait" value="AST-3" />
-	<zone name="Asia/Macao" value="CST-8" />
-	<zone name="Asia/Macau" value="CST-8" />
-	<zone name="Asia/Magadan" value="MAGT-11MAGST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Makassar" value="CIT-8" />
-	<zone name="Asia/Manila" value="PHT-8" />
-	<zone name="Asia/Muscat" value="GST-4" />
-	<zone name="Asia/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Asia/Novosibirsk" value="NOVT-6NOVST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Omsk" value="OMST-6OMSST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Oral" value="ORAT-5" />
-	<zone name="Asia/Phnom_Penh" value="ICT-7" />
-	<zone name="Asia/Pontianak" value="WIT-7" />
-	<zone name="Asia/Pyongyang" value="KST-9" />
-	<zone name="Asia/Qatar" value="AST-3" />
-	<zone name="Asia/Qyzylorda" value="QYZT-6" />
-	<zone name="Asia/Rangoon" value="MMT-6:30" />
-	<zone name="Asia/Riyadh" value="AST-3" />
-	<zone name="Asia/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Asia/Riyadh89" value="zzz-3:07:04" />
-	<zone name="Asia/Saigon" value="ICT-7" />
-	<zone name="Asia/Sakhalin" value="SAKT-10SAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Samarkand" value="UZT-5" />
-	<zone name="Asia/Seoul" value="KST-9" />
-	<zone name="Asia/Shanghai" value="CST-8" />
-	<zone name="Asia/Singapore" value="SGT-8" />
-	<zone name="Asia/Taipei" value="CST-8" />
-	<zone name="Asia/Tashkent" value="UZT-5" />
-	<zone name="Asia/Tbilisi" value="GET-4" />
-	<zone name="Asia/Tehran" value="IRDT" />
-	<zone name="Asia/Tel_Aviv" value="IDDT" />
-	<zone name="Asia/Thimbu" value="BTT-6" />
-	<zone name="Asia/Thimphu" value="BTT-6" />
-	<zone name="Asia/Tokyo" value="JST-9" />
-	<zone name="Asia/Ujung_Pandang" value="CIT-8" />
-	<zone name="Asia/Ulaanbaatar" value="ULAT-8" />
-	<zone name="Asia/Ulan_Bator" value="ULAT-8" />
-	<zone name="Asia/Urumqi" value="CST-8" />
-	<zone name="Asia/Vientiane" value="ICT-7" />
-	<zone name="Asia/Vladivostok" value="VLAT-10VLAST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yakutsk" value="YAKT-9YAKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yekaterinburg" value="YEKT-5YEKST,M3.5.0,M10.5.0/3" />
-	<zone name="Asia/Yerevan" value="AMT-4AMST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Atlantic/Azores" value="AZOT1AZOST,M3.5.0/0,M10.5.0/1" />
-	<zone name="Atlantic/Bermuda" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Atlantic/Canary" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Cape_Verde" value="CVT1" />
-	<zone name="Atlantic/Faeroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Faroe" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Jan_Mayen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Atlantic/Madeira" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Atlantic/Reykjavik" value="GMT0" />
-	<zone name="Atlantic/South_Georgia" value="GST2" />
-	<zone name="Atlantic/Stanley" value="FKT4FKST,M9.1.0,M4.3.0" />
-	<zone name="Atlantic/St_Helena" value="GMT0" />
-
-	<zone name="Australia/ACT" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Adelaide" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Brisbane" value="EST-10" />
-	<zone name="Australia/Broken_Hill" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Canberra" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Currie" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Darwin" value="CST-9:30" />
-	<zone name="Australia/Eucla" value="CWST-8:45" />
-	<zone name="Australia/Hobart" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/LHI" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Lindeman" value="EST-10" />
-	<zone name="Australia/Lord_Howe" value="LHST-10:30LHST-11,M10.1.0,M4.1.0" />
-	<zone name="Australia/Melbourne" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/North" value="CST-9:30" />
-	<zone name="Australia/NSW" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Perth" value="WST-8" />
-	<zone name="Australia/Queensland" value="EST-10" />
-	<zone name="Australia/South" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Sydney" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Tasmania" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/Victoria" value="EST-10EST,M10.1.0,M4.1.0/3" />
-	<zone name="Australia/West" value="WST-8" />
-	<zone name="Australia/Yancowinna" value="CST-9:30CST,M10.1.0,M4.1.0/3" />
-
-	<zone name="Brazil/Acre" value="ACT5" />
-	<zone name="Brazil/DeNoronha" value="FNT2" />
-	<zone name="Brazil/East" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
-	<zone name="Brazil/West" value="AMT4" />
-
-	<zone name="Canada/Atlantic" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/East-Saskatchewan" value="CST6" />
-	<zone name="Canada/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Newfoundland" value="NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" />
-	<zone name="Canada/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="Canada/Saskatchewan" value="CST6" />
-	<zone name="Canada/Yukon" value="PST8PDT,M3.2.0,M11.1.0" />
-
-	<zone name="Chile/Continental" value="CLST" />
-	<zone name="Chile/EasterIsland" value="EASST" />
-
-	<zone name="Etc/GMT" value="GMT0" />
-	<zone name="Etc/GMT0" value="GMT0" />
-	<zone name="Etc/GMT-0" value="GMT0" />
-	<zone name="Etc/GMT+0" value="GMT0" />
-	<zone name="Etc/GMT-1" value="GMT-1" />
-	<zone name="Etc/GMT+1" value="GMT+1" />
-	<zone name="Etc/GMT-10" value="GMT-10" />
-	<zone name="Etc/GMT+10" value="GMT+10" />
-	<zone name="Etc/GMT-11" value="GMT-11" />
-	<zone name="Etc/GMT+11" value="GMT+11" />
-	<zone name="Etc/GMT-12" value="GMT-12" />
-	<zone name="Etc/GMT+12" value="GMT+12" />
-	<zone name="Etc/GMT-13" value="GMT-13" />
-	<zone name="Etc/GMT-14" value="GMT-14" />
-	<zone name="Etc/GMT-2" value="GMT-2" />
-	<zone name="Etc/GMT+2" value="GMT+2" />
-	<zone name="Etc/GMT-3" value="GMT-3" />
-	<zone name="Etc/GMT+3" value="GMT+3" />
-	<zone name="Etc/GMT-4" value="GMT-4" />
-	<zone name="Etc/GMT+4" value="GMT+4" />
-	<zone name="Etc/GMT-5" value="GMT-5" />
-	<zone name="Etc/GMT+5" value="GMT+5" />
-	<zone name="Etc/GMT-6" value="GMT-6" />
-	<zone name="Etc/GMT+6" value="GMT+6" />
-	<zone name="Etc/GMT-7" value="GMT-7" />
-	<zone name="Etc/GMT+7" value="GMT+7" />
-	<zone name="Etc/GMT-8" value="GMT-8" />
-	<zone name="Etc/GMT+8" value="GMT+8" />
-	<zone name="Etc/GMT-9" value="GMT-9" />
-	<zone name="Etc/GMT+9" value="GMT+9" />
-	<zone name="Etc/Greenwich" value="GMT0" />
-	<zone name="Etc/UCT" value="UCT0" />
-	<zone name="Etc/Universal" value="UTC0" />
-	<zone name="Etc/UTC" value="UTC0" />
-	<zone name="Etc/Zulu" value="UTC0" />
-
-	<zone name="Europe/Amsterdam" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Andorra" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Athens" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Belfast" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Belgrade" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Berlin" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bratislava" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Brussels" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Bucharest" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Budapest" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Chisinau" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Copenhagen" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Dublin" value="GMT0IST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Gibraltar" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Guernsey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Helsinki" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Isle_of_Man" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Istanbul" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Jersey" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Kaliningrad" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Kiev" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Lisbon" value="WET0WEST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Ljubljana" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/London" value="GMT0BST,M3.5.0/1,M10.5.0" />
-	<zone name="Europe/Luxembourg" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Madrid" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Malta" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Mariehamn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Minsk" value="EET-2EEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Monaco" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Moscow" value="MSK-3MSD,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Nicosia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Oslo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Paris" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Podgorica" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Prague" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Riga" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Rome" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Samara" value="SAMT-4SAMST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/San_Marino" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sarajevo" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Simferopol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Skopje" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Sofia" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Stockholm" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tallinn" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Tirane" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Tiraspol" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Uzhgorod" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Vaduz" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vatican" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vienna" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Vilnius" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Volgograd" value="VOLT-3VOLST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Warsaw" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zagreb" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-	<zone name="Europe/Zaporozhye" value="EET-2EEST,M3.5.0/3,M10.5.0/4" />
-	<zone name="Europe/Zurich" value="CET-1CEST,M3.5.0,M10.5.0/3" />
-
-	<zone name="Indian/Antananarivo" value="EAT-3" />
-	<zone name="Indian/Chagos" value="IOT-6" />
-	<zone name="Indian/Christmas" value="CXT-7" />
-	<zone name="Indian/Cocos" value="CCT-6:30" />
-	<zone name="Indian/Comoro" value="EAT-3" />
-	<zone name="Indian/Kerguelen" value="TFT-5" />
-	<zone name="Indian/Mahe" value="SCT-4" />
-	<zone name="Indian/Maldives" value="MVT-5" />
-	<zone name="Indian/Mauritius" value="MUT-4" />
-	<zone name="Indian/Mayotte" value="EAT-3" />
-	<zone name="Indian/Reunion" value="RET-4" />
-
-	<zone name="Mexico/BajaNorte" value="PST8PDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/BajaSur" value="MST7MDT,M4.1.0,M10.5.0" />
-	<zone name="Mexico/General" value="CST6CDT,M4.1.0,M10.5.0" />
-
-	<zone name="Mideast/Riyadh87" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh88" value="zzz-3:07:04" />
-	<zone name="Mideast/Riyadh89" value="zzz-3:07:04" />
-
-	<zone name="Pacific/Apia" value="WST11" />
-	<zone name="Pacific/Auckland" value="NZST-12NZDT,M9.5.0,M4.1.0/3" />
-	<zone name="Pacific/Chatham" value="CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45" />
-	<zone name="Pacific/Easter" value="EASST" />
-	<zone name="Pacific/Efate" value="VUT-11" />
-	<zone name="Pacific/Enderbury" value="PHOT-13" />
-	<zone name="Pacific/Fakaofo" value="TKT10" />
-	<zone name="Pacific/Fiji" value="FJT-12" />
-	<zone name="Pacific/Funafuti" value="TVT-12" />
-	<zone name="Pacific/Galapagos" value="GALT6" />
-	<zone name="Pacific/Gambier" value="GAMT9" />
-	<zone name="Pacific/Guadalcanal" value="SBT-11" />
-	<zone name="Pacific/Guam" value="ChST-10" />
-	<zone name="Pacific/Honolulu" value="HST10" />
-	<zone name="Pacific/Johnston" value="HST10" />
-	<zone name="Pacific/Kiritimati" value="LINT-14" />
-	<zone name="Pacific/Kosrae" value="KOST-11" />
-	<zone name="Pacific/Kwajalein" value="MHT-12" />
-	<zone name="Pacific/Majuro" value="MHT-12" />
-	<zone name="Pacific/Marquesas" value="MART9:30" />
-	<zone name="Pacific/Midway" value="SST11" />
-	<zone name="Pacific/Nauru" value="NRT-12" />
-	<zone name="Pacific/Niue" value="NUT11" />
-	<zone name="Pacific/Norfolk" value="NFT-11:30" />
-	<zone name="Pacific/Noumea" value="NCT-11" />
-	<zone name="Pacific/Pago_Pago" value="SST11" />
-	<zone name="Pacific/Palau" value="PWT-9" />
-	<zone name="Pacific/Pitcairn" value="PST8" />
-	<zone name="Pacific/Ponape" value="PONT-11" />
-	<zone name="Pacific/Port_Moresby" value="PGT-10" />
-	<zone name="Pacific/Rarotonga" value="CKT10" />
-	<zone name="Pacific/Saipan" value="ChST-10" />
-	<zone name="Pacific/Samoa" value="SST11" />
-	<zone name="Pacific/Tahiti" value="TAHT10" />
-	<zone name="Pacific/Tarawa" value="GILT-12" />
-	<zone name="Pacific/Tongatapu" value="TOT-13" />
-	<zone name="Pacific/Truk" value="TRUT-10" />
-	<zone name="Pacific/Wake" value="WAKT-12" />
-	<zone name="Pacific/Wallis" value="WFT-12" />
-	<zone name="Pacific/Yap" value="TRUT-10" />
-
-	<zone name="SystemV/AST4" value="AST4" />
-	<zone name="SystemV/AST4ADT" value="AST4ADT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/CST6" value="CST6" />
-	<zone name="SystemV/CST6CDT" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/EST5" value="EST5" />
-	<zone name="SystemV/EST5EDT" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/HST10" value="HST10" />
-	<zone name="SystemV/MST7" value="MST7" />
-	<zone name="SystemV/MST7MDT" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/PST8" value="PST8" />
-	<zone name="SystemV/PST8PDT" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="SystemV/YST9" value="GAMT9" />
-	<zone name="SystemV/YST9YDT" value="AKST9AKDT,M3.2.0,M11.1.0" />
-
-	<zone name="US/Alaska" value="AKST9AKDT,M3.2.0,M11.1.0" />
-	<zone name="US/Aleutian" value="HAST10HADT,M3.2.0,M11.1.0" />
-	<zone name="US/Arizona" value="MST7" />
-	<zone name="US/Central" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Eastern" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/East-Indiana" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Hawaii" value="HST10" />
-	<zone name="US/Indiana-Starke" value="CST6CDT,M3.2.0,M11.1.0" />
-	<zone name="US/Michigan" value="EST5EDT,M3.2.0,M11.1.0" />
-	<zone name="US/Mountain" value="MST7MDT,M3.2.0,M11.1.0" />
-	<zone name="US/Pacific" value="PST8PDT,M3.2.0,M11.1.0" />
-	<zone name="US/Samoa" value="SST11" />
-    </timezones>
-</configuration>
diff --git a/freeswitch.limits.conf b/freeswitch.limits.conf
deleted file mode 100644
index 02d3dff..0000000
--- a/freeswitch.limits.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-freeswitch       soft    core            unlimit
-freeswitch       soft    data            unlimit
-freeswitch       soft    fsize           unlimit
-freeswitch       soft    memlock         unlimit
-freeswitch       soft    nofile          999999 
-freeswitch       soft    rss             unlimit
-freeswitch       hard    stack           240
-freeswitch       soft    cpu             unlimit
-freeswitch       soft    nproc           unlimit
-freeswitch       soft    as              unlimit
-freeswitch       soft    priority        -11
-freeswitch       soft    locks           unlimit
-freeswitch       soft    sigpending      unlimit
-freeswitch       soft    msgqueue        unlimit
-freeswitch       soft    nice            -11
diff --git a/freeswitch.xml b/freeswitch.xml
deleted file mode 100644
index 59f8d7c..0000000
--- a/freeswitch.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<document type="freeswitch/xml">
-
-    <X-PRE-PROCESS cmd="set" data="be-ring=%(1000,3000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="ca-ring=%(2000,4000,440,480)"/>
-    <X-PRE-PROCESS cmd="set" data="cn-ring=%(1000,4000,450)"/>
-    <X-PRE-PROCESS cmd="set" data="cy-ring=%(1500,3000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="cz-ring=%(1000,4000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="de-ring=%(1000,4000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="dk-ring=%(1000,4000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="dz-ring=%(1500,3500,425)"/>
-    <X-PRE-PROCESS cmd="set" data="eg-ring=%(2000,1000,475,375)"/>
-    <X-PRE-PROCESS cmd="set" data="fi-ring=%(1000,4000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500,3500,440)"/>
-    <X-PRE-PROCESS cmd="set" data="hk-ring=%(400,200,440,480);%(400,3000,440,480)"/>
-    <X-PRE-PROCESS cmd="set" data="hu-ring=%(1250,3750,425)"/>
-    <X-PRE-PROCESS cmd="set" data="il-ring=%(1000,3000,400)"/>
-    <X-PRE-PROCESS cmd="set" data="in-ring=%(400,200,425,375);%(400,2000,425,375)"/>
-    <X-PRE-PROCESS cmd="set" data="jp-ring=%(1000,2000,420,380)"/>
-    <X-PRE-PROCESS cmd="set" data="ko-ring=%(1000,2000,440,480)"/>
-    <X-PRE-PROCESS cmd="set" data="pk-ring=%(1000,2000,400)"/>
-    <X-PRE-PROCESS cmd="set" data="pl-ring=%(1000,4000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="ro-ring=%(1850,4150,475,425)"/>
-    <X-PRE-PROCESS cmd="set" data="rs-ring=%(1000,4000,425)"/>
-    <X-PRE-PROCESS cmd="set" data="ru-ring=%(800,3200,425)"/>
-    <X-PRE-PROCESS cmd="set" data="sa-ring=%(1200,4600,425)"/>
-    <X-PRE-PROCESS cmd="set" data="tr-ring=%(2000,4000,450)"/>
-    <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2000,400,450)"/>
-    <X-PRE-PROCESS cmd="set" data="us-ring=%(2000,4000,440,480)"/>
-    <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
-    <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/>
-
-    <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://default"/>
-    <X-PRE-PROCESS cmd="set" data="ignore_display_updates=true"/>
-    <X-PRE-PROCESS cmd="set" data="recordings_dir=/tmp/"/>
-
-    <X-PRE-PROCESS cmd="set" data="send_silence_when_idle=400"/>
-
-    <X-PRE-PROCESS cmd="set" data="codecs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,G729,GSM"/>
-
-    <section name="configuration" description="Various Configuration">
-        <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>
-    </section>
-
-    <section name="dialplan" description="Regex/XML Dialplan">
-    </section>
-
-    <section name="directory" description="User Directory">
-    </section>
-
-    <section name="phrases" description="Speech Phrase Management">
-        <macros>
-            <X-PRE-PROCESS cmd="include" data="lang/de/*.xml"/>
-            <X-PRE-PROCESS cmd="include" data="lang/en/*.xml"/>
-            <X-PRE-PROCESS cmd="include" data="lang/fr/*.xml"/>
-            <X-PRE-PROCESS cmd="include" data="lang/ru/*.xml"/>
-        </macros>
-    </section>
-
-</document>
diff --git a/lang/de/de.xml b/lang/de/de.xml
deleted file mode 100644
index a7dbab0..0000000
--- a/lang/de/de.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<include>
-  <language name="de" sound-prefix="/snds" tts-engine="cepstral" tts-voice="david">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>
-        <!--voicemail_de_tts is purely implemented with tts, we need a files based implementation too -->
-        <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/>
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/de/demo/demo.xml b/lang/de/demo/demo.xml
deleted file mode 100644
index fa77948..0000000
--- a/lang/de/demo/demo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="Sie haben $1 Nachrichten"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="Sie haben $1 Minuten, $2 Sekunden übrig $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="Die Eingabe war ungültig."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sek">
-      <match>
-        <action function="speak-text" data="Sie haben $1 Minuten, $2 Sekunden übrig $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="Die Eingabe war ungültig."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/de/vm/sounds.xml b/lang/de/vm/sounds.xml
deleted file mode 100644
index 657e611..0000000
--- a/lang/de/vm/sounds.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action application="log" data="INFO $1 $2"/>
-        <action function="say" data="$1" method="pronounced" type="items" gender="feminine"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items" gender="feminine"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To listen to new messages -->
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To listen to saved messages -->
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- For advanced options -->
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To exit -->
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To record a greeting -->
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To choose greeting -->
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To record your name -->
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To change password -->
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-        <!-- To return to main menu -->
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action application="log" data="INFO $1 $2"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action application="log" data="INFO $1"/>
-        <action function="say" data="$1" method="counted" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/de/vm/tts.xml b/lang/de/vm/tts.xml
deleted file mode 100644
index f91cae1..0000000
--- a/lang/de/vm/tts.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Bitte geben Sie Ihren Benutzernamen ein, gefolgt von $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Bitte geben Sie Ihr Passwort ein, gefolgt von $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Falsche Benutzerdaten."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Willkommen in Ihrem Postfach."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Auf Wiedersehen."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Zu viele Fehlversuche."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$">
-      <match>
-        <action function="speak-text" data="Sie haben 1 $2 Nachricht im Ordner ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^([0,2-9]+):(.*)$">
-      <match>
-        <action function="speak-text" data="Sie haben $1 $2 Nachrichten im Ordner ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Um neue Nachrichten zu hören, drücken Sie $1. Um gespeicherte Nachrichten zu hören, drücken Sie $2, Für erweiterte Optionen, drücken Sie $3. Zum beenden drücken Sie $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Um eine Ansage aufzunehmen, drücken Sie $1. Um eine Ansage auszuwählen, drücken Sie $2. Um ihren Namen aufzunehmen, drücken Sie $3. Um zum Hauptmenü zurückzukehren, drücken Sie $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Sprechen Sie Ihren Namen nach dem Ton, drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Um die Aufzeichnung anzuhören, drücken Sie $1. Um die Aufzeichnung zu speichern, drücken Sie $2. Für eine erneute Aufnahme drücken Sie $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Drücken Sie $1 um diese Nachricht als wichtig zu markieren. Um fortzufahren drücken Sie $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Drücken Sie $1 um die Nachricht erneut zu hören. Um die Nachricht zu speichern, drücken Sie $2. Zum löschen der Nachricht drücken Sie $3. Für die Weiterleitung als Email, drücken Sie $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Wählen Sie eine Ansage zwischen 1 und 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Ungültige Eingabe."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Zeichnen Sie Ihre Ansage nach dem Ton auf. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Sprechen Sie nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Ansage $1 ausgewählt."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 ist nicht verfügbar."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-        <action function="speak-text" data="$1 Nachricht Nummer $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Nachricht $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$strftime($1|%A, %B %d %Y, %I %M %p)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/demo/demo-ivr.xml b/lang/en/demo/demo-ivr.xml
deleted file mode 100644
index 98f155a..0000000
--- a/lang/en/demo/demo-ivr.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<include>
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/demo/demo.xml b/lang/en/demo/demo.xml
deleted file mode 100644
index bcfe6a8..0000000
--- a/lang/en/demo/demo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="you have $1 messages"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sec">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/demo/funnies.xml b/lang/en/demo/funnies.xml
deleted file mode 100644
index e901c5a..0000000
--- a/lang/en/demo/funnies.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<include>
-  <macro name="funny_prompts" pause="750">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-wakey_wakey_sunshine.wav"/>
-        <action function="play-file" data="ivr/ivr-no_no_no.wav"/>
-        <action function="play-file" data="ivr/ivr-did_you_mean_to_press_key.wav"/>
-        <action function="play-file" data="ivr/ivr-seriously_mean_to_press_key.wav"/>
-        <action function="play-file" data="ivr/ivr-oh_whatever.wav"/>
-        <action function="play-file" data="ivr/ivr-one_more_mistake.wav"/>
-        <action function="play-file" data="ivr/ivr-congratulations_you_pressed_star.wav"/>
-        <action function="play-file" data="ivr/ivr-engineers_busy_assisting_other_sales.wav"/>
-        <action function="play-file" data="ivr/ivr-message_self_destruct.wav"/>
-        <action function="play-file" data="ivr/ivr-all_your_call_are_belong_to_us.wav"/>
-        <action function="play-file" data="ivr/ivr-love_those_touch_tones.wav"/>
-        <action function="play-file" data="ivr/ivr-yes_we_have_no_bananas.wav"/>
-        <action function="play-file" data="ivr/ivr-dude_you_suck.wav"/>
-        <action function="play-file" data="ivr/ivr-on_hold_indefinitely.wav"/>
-        <action function="play-file" data="ivr/ivr-youre_doing_it_wrong.wav"/>
-        <action function="play-file" data="ivr/ivr-were_asterisk_free.wav"/>
-        <action function="play-file" data="ivr/ivr-douche_telecom.wav"/>
-        <action function="play-file" data="ivr/ivr-asterisk_like_syphilis.wav"/>
-        <action function="play-file" data="ivr/ivr-freeguipy.wav"/>
-        <action function="play-file" data="ivr/ivr-terribly_wrong_awkward.wav"/>
-        <action function="play-file" data="ivr/ivr-it_was_that_bug.wav"/>
-        <action function="play-file" data="ivr/ivr-concentrate.wav"/>
-        <action function="play-file" data="ivr/ivr-founder_of_freesource.wav"/>
-        <action function="play-file" data="ivr/ivr-cold_foolish.wav"/>
-        <action function="play-file" data="ivr/ivr-trollover_minutes.wav"/>
-        <action function="play-file" data="ivr/ivr-yuno_silent_drill.wav"/>
-        <action function="play-file" data="ivr/ivr-beacuase.wav"/>
-      </match>
-    </input>
-  </macro>
-</include>
\ No newline at end of file
diff --git a/lang/en/demo/new-demo-ivr.xml b/lang/en/demo/new-demo-ivr.xml
deleted file mode 100644
index 619d992..0000000
--- a/lang/en/demo/new-demo-ivr.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-  <macro name="new_demo_ivr_main_menu" pause="100"> <!-- See conf/ivr_menus/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="silence_stream://500"/>
-
-        <!-- Menu option 1: For information about FreeSWITCH... -->
-        <action function="play-file" data="misc/misc-information_about_freeswitch.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: To learn more about FreeSWITCH Solutions... -->
-        <action function="play-file" data="misc/misc-learn_more_about_freeswitch_solutions.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: To hear about ClueCon -->
-        <action function="play-file" data="misc/misc-to_hear_about_cluecon.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: For other options -->
-        <action function="play-file" data="ivr/ivr-for_other_options.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as new_demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="new_demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: For information about FreeSWITCH... -->
-        <action function="play-file" data="misc/misc-information_about_freeswitch.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: To learn more about FreeSWITCH Solutions... -->
-        <action function="play-file" data="misc/misc-learn_more_about_freeswitch_solutions.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: To hear about ClueCon -->
-        <action function="play-file" data="misc/misc-to_hear_about_cluecon.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: For other options -->
-        <action function="play-file" data="ivr/ivr-for_other_options.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- More information about FreeSWITCH... -->
-  <macro name="learn_about_freeswitch_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <!-- Information about FreeSWITCH and OSTAG... -->
-        <action function="play-file" data="misc-freeswitch_is_state_of_the_art.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-it_is_stable_scalable_extensible.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-free_to_download.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-freeswitch_sponsored_by_ostag.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-ostag_learn_more.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-
-        <!-- Menu option 9: Repeat this information -->
-        <action function="play-file" data="ivr/ivr-repeat_this_information.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- More information about FreeSWITCH Solutions... -->
-  <macro name="learn_about_freeswitch_solutions_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <!-- Information about FreeSWITCH Solutions... -->
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="[[sounds from tony/brian]]"/>
-        <action function="play-file" data="silence_stream://50"/>
-
-        <!-- Menu option 9: Repeat this information -->
-        <action function="play-file" data="ivr/ivr-repeat_this_information.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- More information about ClueCon -->
-  <macro name="learn_about_cluecon_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <!-- Information about ClueCon... -->
-        <action function="play-file" data="misc-cluecon_is_premier_conference.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-chicago_each_summer.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-wide_range_of_persons.wav"/>
-        <action function="play-file" data="silence_stream://50"/>
-        <action function="play-file" data="misc-support_open_source_by_attending.wav"/>
-        <action function="play-file" data="silence_stream://500"/>
-        <action function="play-file" data="ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-        <action function="play-file" data="silence_stream://500"/>
-
-        <!-- Menu option 9: Repeat this information -->
-        <action function="play-file" data="ivr/ivr-repeat_this_information.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/en/dir/sounds.xml b/lang/en/dir/sounds.xml
deleted file mode 100644
index b715a7f..0000000
--- a/lang/en/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_matching_results.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-too_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_results.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-start_new_search.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/dir/tts.xml b/lang/en/dir/tts.xml
deleted file mode 100644
index d5f112d..0000000
--- a/lang/en/dir/tts.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person last name"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person first name"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by first name, press $2"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by last name, press $2"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="Your search match no user on this system, try again."/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 result match your search"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Your search returned too many result, please try again"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="No more result"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Result number $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at extension $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/en.xml b/lang/en/en.xml
deleted file mode 100644
index 3d27bce..0000000
--- a/lang/en/en.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<include>
-  <language name="en" say-module="en" sound-prefix="$${sounds_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-        <!-- voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> <!-- vm/tts.xml if you want to use tts and have cepstral -->
-        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/> <!-- dir/tts.xml if you want to use tts and have cepstral -->
-        <X-PRE-PROCESS cmd="include" data="ivr/*.xml"/>  <!-- IVR and custom phrases go here -->
-      </macros>
-      <X-PRE-PROCESS cmd="include" data="vm/voicemail_ivr.xml"/>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/ivr/sounds.xml b/lang/en/ivr/sounds.xml
deleted file mode 100644
index 0c4f0b9..0000000
--- a/lang/en/ivr/sounds.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<include>
-  <macro name="queue_position">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="ivr/ivr-you_are_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="ivr/ivr-in_line.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="has_called_conf">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-has_joined.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="has_left_conf">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-has_left.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="callers_in_conf">
-    <input pattern="^1$" break_on_match="true">
-      <match>
-        <action function="sleep" data="500"/>
-        <!--<action function="play-file" data="ivr/ivr-there_is.wav"/>-->
-        <action function="play-file" data="digits/1.wav"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-listener_in_conference.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-there_are.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-members_in_conference.wav"/>
-      </match>
-      <nomatch>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-there_are.wav"/>
-        <action function="play-file" data="digits/0.wav"/>
-        <action function="sleep" data="100"/>
-        <action function="play-file" data="conference/conf-members_in_conference.wav"/>
-      </nomatch>
-    </input>
-  </macro>
-
-  <macro name="enter_dest_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-enter_destination_telephone_number.wav"/>
-        <action function="sleep" data="1000"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="enter_src_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-enter_source_telephone_number.wav"/>
-        <action function="sleep" data="1000"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="call_forward_set">
-    <input pattern="^(\d+):(\d+)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-extension_number.wav"/>
-        <action function="sleep" data="400"/>
-        <action function="say" data="$1" method="iterated" type="number"/>
-        <action function="sleep" data="400"/>
-        <action function="play-file" data="digits/2.wav"/>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-extension_number.wav"/>
-        <action function="sleep" data="400"/>
-        <action function="say" data="$2" method="iterated" type="number"/>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-call_forwarding_has_been_set.wav"/>
-        <action function="sleep" data="1500"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="call_forward_cancel">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="sleep" data="1000"/>
-        <action function="play-file" data="ivr/ivr-extension_number.wav"/>
-        <action function="sleep" data="400"/>
-        <action function="say" data="$1" method="iterated" type="number"/>
-        <action function="play-file" data="ivr/ivr-call_forwarding_has_been_cancelled.wav"/>
-        <action function="sleep" data="1500"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="screen_confirm">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-call_from.wav"/>
-        <action function="sleep" data="250"/>
-        <!-- Note, be sure to pass in the full path to the file or else!! -->
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_accept_press_one.wav"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_reject.wav"/>
-        <action function="sleep" data="50"/>
-        <action function="play-file" data="ivr/ivr-hang_up.wav"/>
-        <action function="sleep" data="1500"/>
-        <action function="play-file" data="ivr/ivr-call_from.wav"/>
-        <action function="sleep" data="250"/>
-        <action function="play-file" data="$1"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_accept_press_one.wav"/>
-        <action function="sleep" data="500"/>
-        <action function="play-file" data="ivr/ivr-to_reject.wav"/>
-        <action function="sleep" data="50"/>
-        <action function="play-file" data="ivr/ivr-hang_up.wav"/>
-        <action function="sleep" data="1500"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/vm/sounds.xml b/lang/en/vm/sounds.xml
deleted file mode 100644
index fdef472..0000000
--- a/lang/en/vm/sounds.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_change_pass_success">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-password_has_been_changed.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_change_pass_fail">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-password_not_valid.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To listen to new messages -->
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To listen to saved messages -->
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- For advanced options -->
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To exit -->
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To record a greeting -->
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To choose greeting -->
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To record your name -->
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To change password -->
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To return to main menu -->
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^000|^$|^[Aa]non|^[Pp]rivate" break_on_match="true">
-      <match>
-        <!-- add 'anonymous caller' sound here -->
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="ivr/ivr-this_is_a_call_from.wav"/>
-        <action function="execute" data="sleep(100)"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(500)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="short_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/vm/tts.xml b/lang/en/vm/tts.xml
deleted file mode 100644
index 2de4b37..0000000
--- a/lang/en/vm/tts.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your i d, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your password, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="login incorrect."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="welcome to your voicemail."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="goodbye."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="too many failed attempts."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="you have 1 $1 message in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="speak-text" data="you have $1 $2 messages in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to new messages, press $1, To listen to saved messages, press $2, For advanced options, press $3, to exit, press $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To record a greeting, press $1, To choose a greeting, press $2, To record your name, press $3, to change your password, press $5, to return to the main menu, press $5."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at the tone, please record your name, press any key or stop talking to end the recording."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording, press $1, To save the recording, press $2, To re record, press $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To mark this message urgent, press $1, To continue, press $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="$1 is not a valid extension."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="enter the extension you wish to forward to, then press $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To record an announcement, press $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording again, press $1, To save the recording, press $2,  To delete the recording, press $3, to forward the recording to your email, press $4, to call the caller now, press $5, To forward this message to another extension, press $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="choose a greeting between 1 and 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="invalid value."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your greeting at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your message at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="greeting $1 selected."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 is not available."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-        <action function="speak-text" data="$1 message number $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="message $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/en/vm/voicemail_ivr.xml b/lang/en/vm/voicemail_ivr.xml
deleted file mode 100644
index 1c48299..0000000
--- a/lang/en/vm/voicemail_ivr.xml
+++ /dev/null
@@ -1,417 +0,0 @@
-<include>
-
-  <macros name="voicemail_ivr">
-    <macro name="press_key">
-      <input pattern="^(.*):(.*)$">
-        <match>
-          <action function="play-file" data="$2"/>
-          <action function="play-file" data="voicemail/vm-press.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="plural_msg">
-      <input pattern="^[1]:(.*):(.*)$" break_on_match="true">
-        <match>
-          <action function="play-file" data="$1"/>
-        </match>
-      </input>
-      <input pattern="^.*:(.*):(.*)$" break_on_match="true">
-        <match>
-          <action function="play-file" data="$2"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="enter_id">
-      <input pattern="(.+)">
-        <match>
-          <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-        <nomatch>
-          <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-          <action function="say" data="${VM-Key-Terminator}" method="pronounced" type="name_spelled"/>
-        </nomatch>
-      </input>
-    </macro>
-
-    <macro name="enter_pass">
-      <input pattern="(.+)">
-        <match>
-          <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-        <nomatch>
-          <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-          <action function="say" data="${VM-Key-Terminator}" method="pronounced" type="name_spelled"/>
-        </nomatch>
-
-      </input>
-    </macro>
-
-    <macro name="fail_auth">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="hello">
-      <input>
-        <match>
-          <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-        </match>
-      </input>
-    </macro>
-
-    <macro name="goodbye">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="abort">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-abort.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="message_count">
-      <input field="${VM-Total-New-Urgent-Messages}" pattern="^(0)$">
-        <nomatch>
-          <action function="play-file" data="voicemail/vm-you_have.wav"/>
-          <action function="say" data="${VM-Total-New-Urgent-Messages}" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-urgent-new.wav"/>
-          <action function="phrase" phrase="plural_msg@voicemail_ivr" data="${VM-Total-New-Urgent-Messages}:voicemail/vm-message.wav:voicemail/vm-messages.wav"/>
-        </nomatch>
-      </input>
-      <input field="${VM-Total-New-Messages}" pattern="^(\d+)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-you_have.wav"/>
-          <action function="say" data="${VM-Total-New-Messages}" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-new.wav"/>
-          <action function="phrase" phrase="plural_msg@voicemail_ivr" data="${VM-Total-New-Messages}:voicemail/vm-message.wav:voicemail/vm-messages.wav"/>
-        </match>
-      </input>
-      <input field="${VM-Total-Saved-Messages}" pattern="^(0)$">
-        <nomatch>
-          <action function="play-file" data="currency/and.wav"/>
-          <action function="say" data="${VM-Total-Saved-Messages}" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-saved.wav"/>
-          <action function="phrase" phrase="plural_msg@voicemail_ivr" data="${VM-Total-Saved-Messages}:voicemail/vm-message.wav:voicemail/vm-messages.wav"/>
-        </nomatch>
-      </input>
-    </macro>
-
-    <macro name="menu">
-      <input field="${VM-Total-New-Messages}" pattern="^(0)$">
-        <nomatch>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Play-New-Messages}:voicemail/vm-listen_new.wav"/>
-	</nomatch>
-      </input>
-      <input field="${VM-Total-Saved-Messages}" pattern="^(0)$">
-	<nomatch>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Play-Saved-Messages}:voicemail/vm-listen_saved.wav"/>
-	</nomatch>
-      </input>
-      <input>
-	<match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Config-Menu}:voicemail/vm-advanced.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Terminator}:voicemail/vm-to_exit.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="config_menu">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Record-Greeting}:voicemail/vm-to_record_greeting.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Choose-Greeting}:voicemail/vm-choose_greeting.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Record-Name}:voicemail/vm-record_name2.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Change-Password}:voicemail/vm-change_password.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Menu}:voicemail/vm-main_menu.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_name">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_ask_prepend">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Prepend}:voicemail/vm-forward_add_intro.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Forward}:voicemail/vm-send_message_now.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_ask_extension">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-          <!--<action function="phrase" phrase="play-file" data="voicemail/vm-followed_by.wav"/>-->
-          <!--<action function="say" data="${VM-Key-Terminate}" method="pronounced" type="name_spelled"/>-->
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_file_check">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Listen-File}:voicemail/vm-listen_to_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Save-File}:voicemail/vm-save_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Record-File}:voicemail/vm-rerecord.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_urgent_check">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Urgent}:voicemail/vm-mark-urgent.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Terminator}:voicemail/vm-continue.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_prepend">
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Prepend}:voicemail/vm-forward_add_intro.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Forward}:voicemail/vm-send_message_now.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="forward_message_enter_extension">
-      <input pattern="^([0-9#*])$">
-        <match>
-          <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-          <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="invalid_extension">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="listen_file_check">
-      <input>
-        <match>
-          <!--<action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Next-Msg}:voicemail/vm-for_next_msg.wav"/>--> <!-- Not existant in callie recordings -->
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Listen-File}:voicemail/vm-listen_to_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Save-File}:voicemail/vm-save_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Delete-File}:voicemail/vm-delete_recording.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Forward}:voicemail/vm-to_forward.wav"/>
-        </match>
-      </input>
-      <input field="${VM-Message-Email}" pattern="^$">
-        <nomatch>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Email}:voicemail/vm-forward_to_email.wav"/>
-        </nomatch>
-      </input>
-      <input>
-        <match>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Callback}:voicemail/vm-return_call.wav"/>
-          <action function="phrase" phrase="press_key@voicemail_ivr" data="${VM-Key-Main-Forward}:voicemail/vm-to_forward.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="choose_greeting">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="choose_greeting_fail">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_greeting">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="record_message">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-record_message.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="greeting_selected">
-      <input pattern="^(\d+)$">
-        <match>
-	  <action function="play-file" data="${VM-Preference-Greeting-File-Path}"/>
-          <action function="play-file" data="voicemail/vm-greeting.wav"/>
-          <action function="say" data="$1" method="pronounced" type="items"/>
-          <action function="play-file" data="voicemail/vm-selected.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="play_greeting">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-person.wav"/>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-          <action function="play-file" data="voicemail/vm-not_available.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_number">
-      <input pattern="^(\d+)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="items"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_message_number">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-${VM-Message-Type}.wav"/>
-          <action function="play-file" data="voicemail/vm-message_number.wav"/>
-          <action function="say" data="${VM-Message-Number}" method="pronounced" type="items"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_phone_number">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_name">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        </match>
-      </input>
-    </macro>
-    <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-    <macro name="ack">
-      <input pattern="^(too-small)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-too-small.wav"/>
-        </match>
-      </input>
-      <input pattern="^(undeleted)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(deleted)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(saved)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(emailed)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-      <input pattern="^(marked-urgent)$">
-        <match>
-          <action function="play-file" data="voicemail/vm-message.wav"/>
-          <action function="play-file" data="voicemail/vm-$1.wav"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_date">
-      <input pattern="^(.*)$">
-        <match>
-          <action function="say" data="$1" method="pronounced" type="short_date_time"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="say_date_event">
-      <input>
-        <match>
-          <action function="say" data="${VM-Message-Received-Epoch}" method="pronounced" type="short_date_time"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="play_message">
-      <input>
-        <match>
-          <action function="play-file" data="${VM-Message-File-Path}"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="play_recording">
-      <input>
-        <match>
-          <action function="play-file" data="${VM-Record-File-Path}"/>
-        </match>
-      </input>
-    </macro>
-
-    <macro name="disk_quota_exceeded">
-      <input>
-        <match>
-          <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-      </input>
-    </macro>
-  </macros>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/es/demo/demo-es-ES.xml b/lang/es/demo/demo-es-ES.xml
deleted file mode 100644
index 4c6919d..0000000
--- a/lang/es/demo/demo-es-ES.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="Usted tiene $1 mensajes"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/demo/demo-es-MX.xml b/lang/es/demo/demo-es-MX.xml
deleted file mode 100644
index 4c6919d..0000000
--- a/lang/es/demo/demo-es-MX.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="Usted tiene $1 mensajes"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Quedan $1 minutos y $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Esa fue una entrada inválida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/demo/demo-ivr-es-ES.xml b/lang/es/demo/demo-ivr-es-ES.xml
deleted file mode 100644
index ec7d7bc..0000000
--- a/lang/es/demo/demo-ivr-es-ES.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/demo/demo-ivr-es-MX.xml b/lang/es/demo/demo-ivr-es-MX.xml
deleted file mode 100644
index ec7d7bc..0000000
--- a/lang/es/demo/demo-ivr-es-MX.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/dir/sounds-es-ES.xml b/lang/es/dir/sounds-es-ES.xml
deleted file mode 100644
index 2bdc149..0000000
--- a/lang/es/dir/sounds-es-ES.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/dir/sounds-es-MX.xml b/lang/es/dir/sounds-es-MX.xml
deleted file mode 100644
index 2bdc149..0000000
--- a/lang/es/dir/sounds-es-MX.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/dir/tts-es-ES.xml b/lang/es/dir/tts-es-ES.xml
deleted file mode 100644
index fbdeca7..0000000
--- a/lang/es/dir/tts-es-ES.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Introduzca las primeras letras del apellido de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Introduzca las primeras letras del nombre de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por apellido, pulse $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por nombre, pulse $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Necesita especificar un mínimo de $1 letras del nombre buscado. Por favor intente de nuevo."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="No hay resultados que coincidan con su busqueda. Por favor intente de nuevo."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados coinciden con su busqueda."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Su busqueda genera demasiados resultados. Por favor intente de nuevo."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="No hay más resultados."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para seleccionar este resultado pulse $1, para el resultado siguiente pulse $2, para el resultado previo pulse $3, para empezar una nueva busqueda pulse $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="en la extensión $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/dir/tts-es-MX.xml b/lang/es/dir/tts-es-MX.xml
deleted file mode 100644
index ddf15d0..0000000
--- a/lang/es/dir/tts-es-MX.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Ingrese las primeras letras del apellido de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Ingrese las primeras letras del nombre de la persona."/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por apellido, pulse $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por nombre, pulse $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Necesita especificar un mínimo de $1 letras del nombre buscado. Por favor intente de nuevo."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="No hay resultados que coincidan con su busqueda. Por favor intente de nuevo."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados coinciden con su busqueda."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Su busqueda genera demasiados resultados. Por favor intente de nuevo."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="No hay más resultados."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para seleccionar este resultado pulse $1, para el resultado siguiente pulse $2, para el resultado previo pulse $3, para empezar una nueva busqueda pulse $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="en la extensión $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/es_ES.xml b/lang/es/es_ES.xml
deleted file mode 100644
index f8de685..0000000
--- a/lang/es/es_ES.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="es" sound-path="$${sounds_dir}/es/ES/cristina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-ES.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_ES_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-ES.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-ES.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/lang/es/es_MX.xml b/lang/es/es_MX.xml
deleted file mode 100644
index 936abcf..0000000
--- a/lang/es/es_MX.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="es" sound-path="$${sounds_dir}/es/mx/maria" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-es-MX.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_es_MX_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-es-MX.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-es-MX.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/lang/es/vm/sounds-es-ES.xml b/lang/es/vm/sounds-es-ES.xml
deleted file mode 100644
index dcc9d9f..0000000
--- a/lang/es/vm/sounds-es-ES.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/un.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2_s.wav"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/vm/sounds-es-MX.xml b/lang/es/vm/sounds-es-MX.xml
deleted file mode 100644
index 1f22c43..0000000
--- a/lang/es/vm/sounds-es-MX.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/un.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/vm/tts-es-ES.xml b/lang/es/vm/tts-es-ES.xml
deleted file mode 100644
index 6dab48c..0000000
--- a/lang/es/vm/tts-es-ES.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduzca su número de usuario, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduzca su contraseña, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Inicio de sesión incorrecto."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bienvenido a su buzón de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Adiós."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Demasiados intentos fallidos."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Usted tiene 1 $1 mensaje en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Usted tiene $1 $2 mensajes en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar mensajes nuevos, pulse $1. Para escuchar mensajes guardados, pulse $2. Para opciones avanzadas, pulse $3. Para salir, pulse $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para grabar un saludo, pulse $1. Para elegir un saludo, pulse $2. Para grabar su nombre, pulse $3. Para cambiar su contraseña, pulse $5. Para el menú principal, pulse $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Por favor grabe su nombre después de la señal, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para regrabar, pulse $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar este mensaje como urgente, pulse $1. Para continuar, pulse $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 no es una extensión válida."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Introduzca la extensión a la cual quiere enviar este mensaje, seguido de $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para grabar un saludo, pulse $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para eliminar la grabación, pulse $3. Para enviar la grabación a su e-mail, pulse $4. Para devolver la llamada, pulse $5. Para enviar este mensaje a otra extensión, pulse $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Elija un saludo entre 1 y 9."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su saludo después de la señal, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su mensaje después de la señal, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saludo $1 seleccionado."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 no está disponible."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensaje número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="mensaje $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/es/vm/tts-es-MX.xml b/lang/es/vm/tts-es-MX.xml
deleted file mode 100644
index ce5722e..0000000
--- a/lang/es/vm/tts-es-MX.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor ingrese su número de usuario, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor ingrese su contraseña, seguido por $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Inicio de sesión incorrecto."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bienvenido a su buzón de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Adiós."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Demasiados intentos fallidos."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Usted tiene 1 $1 mensaje en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Usted tiene $1 $2 mensajes en la bandeja de entrada ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar mensajes nuevos, pulse $1. Para escuchar mensajes guardados, pulse $2. Para opciones avanzadas, pulse $3. Para salir, pulse $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para grabar un saludo, pulse $1. Para elegir un saludo, pulse $2. Para grabar su nombre, pulse $3. Para cambiar su contraseña, pulse $5. Para el menú principal, pulse $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Después del tono, por favor anote su nombre, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para regrabar, pulse $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar este mensaje como urgente, pulse $1. Para continuar, pulse $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 no es una extensión válida."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Introduzca la extensión a la cual quiere enviar este mensaje, seguido de $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para grabar un saludo, pulse $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para escuchar la grabación, pulse $1. Para guardar la grabación, pulse $2. Para eliminar la grabación, pulse $3. Para enviar la grabación a su e-mail, pulse $4. Para devolver la llamada, pulse $5. Para enviar este mensaje a otra extensión, pulse $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Elija un saludo entre 1 y 9."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su saludo después del tono, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Grabe su mensaje después del tono, pulse cualquier tecla o deje de hablar para poner fin a la grabación."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saludo $1 seleccionado."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 no está disponible."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensaje número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="mensaje $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/fr/demo/demo.xml b/lang/fr/demo/demo.xml
deleted file mode 100644
index 0d0de59..0000000
--- a/lang/fr/demo/demo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="tuas.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="messages.wav"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timeleft">
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="il reste $1 minutes et $2 secondes"/>
-      </match>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/fr/dir/sounds.xml b/lang/fr/dir/sounds.xml
deleted file mode 100644
index a0dcb2c..0000000
--- a/lang/fr/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum_first.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_match_entry.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-to_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-to_make_new_search.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/fr/dir/tts.xml b/lang/fr/dir/tts.xml
deleted file mode 100644
index 7d3e5e3..0000000
--- a/lang/fr/dir/tts.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Veuillez entrer les premières lettres du nom de famille"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Veuillez entrer les premières lettres du prénom"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="pour chercher par prénom, tapez $2"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="pour chercher par nom de famille, tapez $2"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(1)$">
-      <match>
-        <action function="speak-text" data="Vous devez entrer au minimum une lettre du nom de la personne, essayez encore"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Vous devez entrer au minimum $1 lettres du nom de la personne, essayer encore"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="Votre recherche n'a retournée aucun résultat, essayez encore"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 résultats correspondent à votre recherche"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Votre recherche retourne trop de résultats, essayer encore"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Fin des résultats."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Résultat numéro $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="speak-text" data="Pour sélectionner ce nom, tapez $1, pour le nom suivant tapez $2, pour le nom précédent, tapez $3, pour faire une nouvelle recherche, tapez $4"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="au poste $1"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/fr/fr.xml b/lang/fr/fr.xml
deleted file mode 100644
index 124ca02..0000000
--- a/lang/fr/fr.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<include>
-  <language name="fr" say-module="fr" sound-prefix="$${sounds_dir}/fr/ca/june" tts-engine="cepstral" tts-voice="david">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>
-        <!-- voicemail_fr_tts is purely implemented with tts, we need a files based implementation too -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
-        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/> <!-- dir/tts.xml if you want to use tts and have cepstral -->
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/fr/vm/sounds.xml b/lang/fr/vm/sounds.xml
deleted file mode 100644
index 9cd209e..0000000
--- a/lang/fr/vm/sounds.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Entrez votre Identification, suivi par $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Entrez votre code, suivi par $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Identification incorrecte."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Bienvenue sur votre répondeur."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Au revoir."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="Trop de tentatives ont échouées."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^([^:]+):urgent-new">
-      <match>
-        <action function="speak-text" data="Vous avez $1 nouveaux messages urgents dans le répertoire ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^([^:]+):new">
-      <match>
-        <action function="speak-text" data="Vous avez $1 nouveaux messages dans le répertoire ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^([^:]+):saved">
-      <match>
-        <action function="speak-text" data="Vous avez $1 messages sauvegardés dans le répertoire ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Pour écouter les nouveaux messages, tapez $1, Pour écouter les messages enregistrés, tapez $2, Pour les options avancées, tapez $3, pour sortir, tapez $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="pour enregistrer un message d'accueil, tapez $1, Pour choisir votre message d'accueil, tapez $2, Pour enregistrer votre nom, tapez $3, Pour changer votre mot de passe, tapez $4, Pour retourner au menu principal, tapez $5."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="enregistrez votre nom après le bip, puis tapez une touche, ou arrêtez de parler pour arrêter l'enregistrement."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Pour écouter l'enregistrement, tapez $1, pour sauvegarder l'enregistrement, tapez $2, Pour réenregistrer, tapez $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="Pour indiquer que ce message est urgent, tapez $1, Pour continuer, tapez $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])(:(.*))?$">
-      <match>
-        <action function="speak-text"
-                data="Pour réécouter l'enregistrement à nouveau, tapez $1, Pour sauvegarder l'enregistrement, tapez $2, Pour supprimer l'enregistrement, tapez $3, pour transférer l'enregistrement à votre email $8, tapez $4, Pour appeler l'auteur du message, tapez $5, Pour transférer ce message à un autre numéro, tapez $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="choisissez un message d'accueil entre 1 et 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="valeur incorrecte."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="enregistrez votre message d'accueil après le bip, puis tapez une touche ou arrêtez de parler pour arrêter l'enregistrement."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="enregistrez votre message après le bip, puis tapez une touche ou arrêtez de parler pour arrêter l'enregistrement."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="message d'accueil numéro $1 sélectionné."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 n'est pas disponible."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^new:(.*)$">
-      <match>
-        <action function="speak-text" data="nouveau message numéro $1."/>
-      </match>
-    </input>
-    <input pattern="^saved:(.*)$">
-      <match>
-        <action function="speak-text" data="message sauvegardé numéro $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="speak-text" data="message trop court"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="speak-text" data="message supprimé"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="speak-text" data="message sauvegardé"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="speak-text" data="message envoyé"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="speak-text" data="message marqué urgent"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="${strftime($1|%e/%m/%Y, %H heures %M)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/he/demo/demo-ivr.xml b/lang/he/demo/demo-ivr.xml
deleted file mode 100644
index df8d24b..0000000
--- a/lang/he/demo/demo-ivr.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<include>
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/he/demo/demo.xml b/lang/he/demo/demo.xml
deleted file mode 100644
index bcfe6a8..0000000
--- a/lang/he/demo/demo.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<include>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="you have $1 messages"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sec">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/he/dir/sounds.xml b/lang/he/dir/sounds.xml
deleted file mode 100644
index 5fd13ff..0000000
--- a/lang/he/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter_person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_matching_results.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-too_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_results.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-start_new_search.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/he/he.xml b/lang/he/he.xml
deleted file mode 100644
index 7cca73c..0000000
--- a/lang/he/he.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<include>
-  <language name="he" sound-prefix="$${sounds_dir}/he/daniel" tts-engine="cepstral" tts-voice="daniel">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
-        <X-PRE-PROCESS cmd="include" data="dir/sounds.xml"/>
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/he/vm/sounds.xml b/lang/he/vm/sounds.xml
deleted file mode 100644
index 917c84b..0000000
--- a/lang/he/vm/sounds.xml
+++ /dev/null
@@ -1,417 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To listen to new messages -->
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To listen to saved messages -->
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- For advanced options -->
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To exit -->
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <!-- To record a greeting -->
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To choose greeting -->
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To record your name -->
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To change password -->
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="execute" data="sleep(100)"/>
-
-        <!-- To return to main menu -->
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/pt/demo/demo-ivr-pt-BR.xml b/lang/pt/demo/demo-ivr-pt-BR.xml
deleted file mode 100644
index ec7d7bc..0000000
--- a/lang/pt/demo/demo-ivr-pt-BR.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/demo/demo-ivr-pt-PT.xml b/lang/pt/demo/demo-ivr-pt-PT.xml
deleted file mode 100644
index ec7d7bc..0000000
--- a/lang/pt/demo/demo-ivr-pt-PT.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="100"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="play-file" data="silence_stream://1500"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Register for ClueCon -->
-        <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 6: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/6.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="100"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="silence_stream://1000"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="play-file" data="silence_stream://2000"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short"> 
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/demo/demo-pt-BR.xml b/lang/pt/demo/demo-pt-BR.xml
deleted file mode 100644
index 846561a..0000000
--- a/lang/pt/demo/demo-pt-BR.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="you have $1 messages"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa opção não é valida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa opção não é valida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/demo/demo-pt-PT.xml b/lang/pt/demo/demo-pt-PT.xml
deleted file mode 100644
index 34464f7..0000000
--- a/lang/pt/demo/demo-pt-PT.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-    <macro name="msgcount">
-      <input pattern="(.*)">
-	<match>
-	  <action function="execute" data="sleep(1000)"/>
-	  <action function="play-file" data="voicemail/vm-you_have.wav"/>
-	  <action function="say" data="$1" method="pronounced" type="items"/>
-	  <action function="play-file" data="voicemail/vm-messages.wav"/>
-	  <!-- or -->
-	  <!--<action function="speak-text" data="Você tem $1 mensagens"/>-->
-	</match>
-      </input>
-    </macro>
-    <macro name="saydate">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="timespec">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="ip-addr">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="iterated" type="ip_address"/>
-	  <action function="say" data="$1" method="pronounced" type="ip_address"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="spell-phonetic">
-      <input pattern="(.*)">
-	<match>
-	  <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-	</match>
-      </input>
-    </macro>
-    <macro name="tts-timeleft">
-      <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-      <!-- If the function "break" is encountered all parsing will cease -->
-      <input pattern="(\d+):(\d+)">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	  <action function="break"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa era uma entrada inválida."/>
-	</nomatch>
-      </input>
-      <input pattern="(\d+) min (\d+) sec">
-	<match>
-	  <action function="speak-text" data="Faltam $1 minutos, $2 segundos $strftime(%Y-%m-%d)"/>
-	</match>
-	<nomatch>
-	  <action function="speak-text" data="Essa era uma entrada inválida."/>
-	</nomatch>
-      </input>
-    </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/dir/sounds-pt-BR.xml b/lang/pt/dir/sounds-pt-BR.xml
deleted file mode 100644
index 2bdc149..0000000
--- a/lang/pt/dir/sounds-pt-BR.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/dir/sounds-pt-PT.xml b/lang/pt/dir/sounds-pt-PT.xml
deleted file mode 100644
index 2bdc149..0000000
--- a/lang/pt/dir/sounds-pt-PT.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-enter_person.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-                <action function="play-file" data="directory/dir-enter_person.wav"/>
-                <action function="play-file" data="directory/dir-first_name.wav"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-first_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="play-file" data="directory/dir-to_search_by.wav"/>
-				<action function="play-file" data="directory/dir-last_name.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-specify_mininum.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="play-file" data="directory/dir-no_matching_results.wav"/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="directory/dir-result_match.wav"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-too_many_result.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-no_more_results.wav"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-result_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="play-file" data="directory/dir-at_extension.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="play-file" data="directory/dir-to_select_entry.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_next.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-for_prev.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-				<action function="play-file" data="directory/dir-start_new_search.wav"/>
-				<action function="play-file" data="directory/dir-press.wav"/>
-				<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/dir/tts-pt-BR.xml b/lang/pt/dir/tts-pt-BR.xml
deleted file mode 100644
index 71b79c6..0000000
--- a/lang/pt/dir/tts-pt-BR.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor marque as primeiras letras do apelido da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor marque as primeiras letras do nome da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por primeiro nome, digite $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para buscar por apelido, digite $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Você precisa dizer um mínimo de $1 letras do nome da pessoa, tente novamente."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="Não foram encontrados resultados, tente novamente."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados encontrados para a sua busca."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="A  sua busca devolveu muitos resultados, por favor tente novamente."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Não há mais resultados."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para escolher este resultado digite $1, Para o resultado seguinte digite $2, Para o resultado anterior digite $3, Para uma nova busca digite $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="No ramal $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/dir/tts-pt-PT.xml b/lang/pt/dir/tts-pt-PT.xml
deleted file mode 100644
index 4f03c5a..0000000
--- a/lang/pt/dir/tts-pt-PT.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-
-	<macro name="directory_intro">
-		<input pattern="^(last_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor introduza os primeiras letras do apelido da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(first_name)" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Por favor introduza os primeiros dígitos do primeiro nome da pessoa"/>
-			</match>
-		</input>
-		<input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para pesquisar por primeiro nome, marque $2"/>
-			</match>
-		</input>
-		<input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-			<match>
-				<action function="speak-text" data="Para pesquisar por apelido, marque $2"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_min_search_digits">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Você necessita de especificar um mínimo de $1 letras do nome da pessoa, tente novamente."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count">
-		<input pattern="^0$" break_on_match="true">
-			<match>
-				<action function="speak-text" data="Não foram encontrados resultados, tente novamente."/>
-			</match>
-		</input>
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1 resultados encontrados para a sua pesquisa."/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_count_too_large">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="A sua pesquisa devolveu demasiados resultados, por favor tente novamente."/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_last">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Não há mais resultados"/>
-			</match>
-		</input>
-
-	</macro>
-
-	<macro name="directory_result_item">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Resultado número $1"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_menu">
-		<input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-			<match>
-				<action function="speak-text" data="Para seleccionar este resultado marque $1, Para o resultado seguinte marque $2, Para o resultado anterior marque $3, Para iniciar uma nova pesquisa marque $4"/>
-			</match>
-		</input>
-	</macro>
-
-	<macro name="directory_result_at">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="Na extensão $1"/>
-			</match>
-		</input>
-	</macro>
-	<macro name="directory_result_say_name">
-		<input pattern="^(.*)$">
-			<match>
-				<action function="speak-text" data="$1"/>
-			</match>
-		</input>
-	</macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/pt_BR.xml b/lang/pt/pt_BR.xml
deleted file mode 100644
index 690ee69..0000000
--- a/lang/pt/pt_BR.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="pt" sound-path="$${sounds_dir}/pt/BR/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-BR.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_BR_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-BR.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-BR.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/lang/pt/pt_PT.xml b/lang/pt/pt_PT.xml
deleted file mode 100644
index c30b361..0000000
--- a/lang/pt/pt_PT.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <language name="pt" sound-path="$${sounds_dir}/pt/PT/karina" tts-engine="cepstral" tts-voice="marta">
-    <X-PRE-PROCESS cmd="include" data="demo/*-pt-PT.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-    <!--voicemail_pt_PT_tts is purely implemented with tts, we have the files based one that is the default. -->
-    <X-PRE-PROCESS cmd="include" data="vm/sounds-pt-PT.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-    <X-PRE-PROCESS cmd="include" data="dir/sounds-pt-PT.xml"/>  <!-- dir/tts.xml if you want to use tts and have cepstral -->
-  </language>
-</include>
diff --git a/lang/pt/vm/sounds-pt-BR.xml b/lang/pt/vm/sounds-pt-BR.xml
deleted file mode 100644
index 1ab472a..0000000
--- a/lang/pt/vm/sounds-pt-BR.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/uma.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/> 
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2_s.wav"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/vm/sounds-pt-PT.xml b/lang/pt/vm/sounds-pt-PT.xml
deleted file mode 100644
index 587d3fe..0000000
--- a/lang/pt/vm/sounds-pt-PT.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_id.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(1):(.*)$" break_on_match="true">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="play-file" data="digits/uma.wav"/>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$2.wav"/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
-	<action function="play-file" data="voicemail/vm-$2_s.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To listen to new messages -->
-	<action function="play-file" data="voicemail/vm-listen_new.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To listen to saved messages -->
-	<action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- For advanced options -->
-	<action function="play-file" data="voicemail/vm-advanced.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To exit -->
-	<action function="play-file" data="voicemail/vm-to_exit.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<!-- To record a greeting -->
-	<action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To choose greeting -->
-	<action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To record your name -->
-	<action function="play-file" data="voicemail/vm-record_name2.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To change password -->
-	<action function="play-file" data="voicemail/vm-change_password.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="execute" data="sleep(100)"/>
-
-	<!-- To return to main menu -->
-	<action function="play-file" data="voicemail/vm-main_menu.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-continue.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-	<action function="play-file" data="voicemail/vm-followed_by.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$4" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-save_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$2" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$3" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-return_call.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$5" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
-	<action function="play-file" data="voicemail/vm-press.wav"/>
-	<action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-greeting.wav"/>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-	<action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-person.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-$1.wav"/> 
-	<action function="play-file" data="voicemail/vm-message_number.wav"/>
-	<action function="say" data="$2" method="pronounced" type="items"/> 
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack"> 
-    <input pattern="^(too-small)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-	<action function="play-file" data="voicemail/vm-message.wav"/>
-	<action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_disk_quota_exceeded">
-    <input pattern="^(.*)$">
-        <match>
-            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
-        </match>
-    </input>
-  </macro>
-
-  <macro name="valet_announce_ext">
-    <input pattern="^([^\:]+):(.*)$">
-      <match>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_full">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="valet_lot_empty">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
-      </match>
-    </input>
-  </macro>
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/vm/tts-pt-BR.xml b/lang/pt/vm/tts-pt-BR.xml
deleted file mode 100644
index 4f77045..0000000
--- a/lang/pt/vm/tts-pt-BR.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor digite o seu número de usuario, e depois $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor digite a sua contrasenha, e depois $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Inicio incorreto da sessão."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bem-vindo ao seu correio de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Até logo."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Muitas tentativas fracassadas."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Você tem 1 $1 mensagem no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Você tem  $1 $2 mensagens no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir as mensagens novas, digite $1, Para ouvir as mensagens armazenadas, digite $2, Para opções avançadas, digite $3, Para sair, digite $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para gravar a sua saudação, digite $1, Para escolher a sua saudação, digite $2, Para gravar o seu nome, digite $3, Para mudar a sua senha, digite $5, Para o menu principal, digite $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave o seu nome, digite qualquer tecla ou deixe de falar para finalizar a gravação."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação, digite $1, Para guardar a gravação, digite $2, Para gravar novamente, digite $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar esta mensagem como urgente, digite $1, Para continuar, digite $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 não é um ramal válido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Marque o ramal para o qual pretende encaminhar esta mensagem, e depois $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para gravar um anúncio, digite $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação novamente, press $1, Para guardar a gravação, press $2,  Para borrar a gravação, press $3, Para enviar a gravação para o seu email, press $4, Para devolver a ligação agora, press $5, Para encaminhar esta mensagem para outro ramal, press $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Escolha uma saudação entre as opções 1 e 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua saudação, digite qualquer tecla ou deixe de falar para finalizar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua mensagem, digite qualquer tecla ou deixe de falar para finalizar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saudação $1 selecionada."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 não está disponível."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensagem número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Mensagem $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/pt/vm/tts-pt-PT.xml b/lang/pt/vm/tts-pt-PT.xml
deleted file mode 100644
index c3dfc3a..0000000
--- a/lang/pt/vm/tts-pt-PT.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<include><!--This line will be ignored it's here to validate the xml and is optional -->
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduza o seu número de utilizador, seguido de $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Por favor introduza a sua palavra passe, seguida de $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Falha na autenticação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Bem-vindo ao seu correio de voz."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Até breve."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-	<action function="speak-text" data="Demasiadas tentativas falhadas."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-	<action function="speak-text" data="Você tem 1 $1 mensagen no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-	<action function="speak-text" data="Você tem $1 $2 mensagens no directório ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir as mensagens novas, marque $1, Para ouvir as mensagens guardadas, marque $2, Para opções avançadas, marque $3, Para sair, marque $4."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para gravar a sua saudação, marque $1, Para escolher a sua saudação, marque $2, Para gravar o seu nome, marque $3, Para alterar a sua palavra passe, marque $5, Para o menu principal, marque $5."/>
-      </match>
-    </input>
-  </macro>
-
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave o seu nome, pressione qualquer tecla ou deixe de falar para parar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação, marque $1, Para guardar a gravação, marque $2, Para gravar novamente, marque $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para marcar esta mensagem como urgente, marque $1, Para continuar, marque $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="$1 não é uma extensão válida."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Introduza a extensão para a qual pretende encaminhar esta mensagem, seguido de $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-	<action function="speak-text" data="Para gravar um anúncio, marque $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-	<action function="speak-text" 
-		data="Para ouvir a gravação novamente, marque $1, Para guardar a gravação, marque $2,  Para apagar a gravação, marque $3, Para encaminhar a gravação para o seu email, marque $4, Para devolver a chamada agora, marque $5, Para encaminhar esta mensagem para outra extensão, marque $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Seleccione uma saudação entre 1 e 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="valor inválido."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua saudação, pressione qualquer tecla ou deixe de falar para parar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Após o sinal grave a sua mensagem, pressione qualquer tecla ou deixe de falar para parar a gravação."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Saudação $1 seleccionada."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1 não está disponível."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-	<action function="speak-text" data="$1 mensagem número $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="Mensagem $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-	<action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
diff --git a/lang/ru/demo/demo-ivr.xml b/lang/ru/demo/demo-ivr.xml
deleted file mode 100644
index 7de0d7f..0000000
--- a/lang/ru/demo/demo-ivr.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<include>
-
-  <macro name="demo_ivr_count">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="demo_ivr_main_menu" pause="250"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
-    <input pattern="(.*)">
-      <match>
-        <!-- string together several existing sound files to create one long greeting -->
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
-        <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
-        <action function="execute" data="sleep(1500)"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="execute" data="sleep(2000)"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short" pause="250">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option 1: Call FreeSWITCH conference-->
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/1.wav"/>
-
-        <!-- Menu option 2: Do FreeSWITCH echo test -->
-        <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/2.wav"/>
-
-        <!-- Menu option 3: Listen to Music on Hold -->
-        <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/3.wav"/>
-
-        <!-- Menu option 4: Hear a sample submenu -->
-        <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/4.wav"/>
-
-        <!-- Menu option 5: Listen to screaming monkeys -->
-        <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/5.wav"/>
-
-        <!-- Menu option 9: Repeat these options -->
-        <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/9.wav"/>
-        <action function="execute" data="sleep(2000)"/>
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the "long" greeting for the demo_ivr_sub_menu -->
-  <macro name="demo_ivr_sub_menu">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-  <!-- The following macro is the same as demo_ivr_sub_menu except it is the "short" version -->
-  <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_sub_menu_short">
-    <input pattern="(.*)">
-      <match>
-        <!-- Menu option *: Return to top menu -->
-        <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="play-file" data="ivr/ivr-please.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="play-file" data="digits/star.wav"/>
-
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/ru/demo/demo.xml b/lang/ru/demo/demo.xml
deleted file mode 100644
index 10c9dbc..0000000
--- a/lang/ru/demo/demo.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<include>
-  <macro name="saymoney">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="currency"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="msgcount">
-    <input pattern="(.*)">
-      <match>
-        <action function="execute" data="sleep(1000)"/>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <!-- or -->
-        <!--<action function="speak-text" data="you have $1 messages"/>-->
-      </match>
-    </input>
-  </macro>
-  <macro name="saydate">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="saydatetime">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="time_measurement"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="timespec2">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="CURRENT_DATE_TIME"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr-interated">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="iterated" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="ip-addr">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="ip_address"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="spell-phonetic">
-    <input pattern="(.*)">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_phonetic"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="tts-timeleft">
-    <!-- The parser will visit each <input> tag and execute the actions in <match> or <nomatch> depending on the pattern param -->
-    <!-- If the function "break" is encountered all parsing will cease -->
-    <input pattern="(\d+):(\d+)">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-        <action function="break"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-    <input pattern="(\d+) min (\d+) sec">
-      <match>
-        <action function="speak-text" data="You have $1 minutes, $2 seconds remaining $strftime(%Y-%m-%d)"/>
-      </match>
-      <nomatch>
-        <action function="speak-text" data="That input was invalid."/>
-      </nomatch>
-    </input>
-  </macro>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/ru/dir/sounds.xml b/lang/ru/dir/sounds.xml
deleted file mode 100644
index a0dcb2c..0000000
--- a/lang/ru/dir/sounds.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-enter-person.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-first_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="play-file" data="directory/dir-to_search_by.wav"/>
-        <action function="play-file" data="directory/dir-last_name.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-specify_mininum_first.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-letters_of_person_name.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="play-file" data="directory/dir-no_match_entry.wav"/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="directory/dir-result_match.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-to_many_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-no_more_result.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-result_number.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="directory/dir-at_extension.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="play-file" data="directory/dir-to_select_entry.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_next.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-for_prev.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="directory/dir-to_make_new_search.wav"/>
-        <action function="play-file" data="directory/dir-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/ru/dir/tts.xml b/lang/ru/dir/tts.xml
deleted file mode 100644
index f0aafa2..0000000
--- a/lang/ru/dir/tts.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<include>
-
-  <macro name="directory_intro">
-    <input pattern="^(last_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person last name"/>
-      </match>
-    </input>
-    <input pattern="^(first_name)" break_on_match="false">
-      <match>
-        <action function="speak-text" data="Please enter the first few digit of the person first name"/>
-      </match>
-    </input>
-    <input pattern="^(last_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by first name, press $2"/>
-      </match>
-    </input>
-    <input pattern="^(first_name):([0-9#*])$" break_on_match="false">
-      <match>
-        <action function="speak-text" data="to search by last name, press $2"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_min_search_digits">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="You need to specify a minimum the first $1 letters of the person name, try again."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count">
-    <input pattern="^0$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="Your search match no user on this system, try again."/>
-      </match>
-    </input>
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 result match your search"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_count_too_large">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Your search returned too many result, please try again"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_last">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="No more result"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_item">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="Result number $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_menu">
-    <input pattern="^([0-9#*]),([0-9#*]),([0-9#*]),([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To select this entry press $1, for the next entry press $2, for the previous entry press $3, to make a new search press $4"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="directory_result_at">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at extension $1"/>
-      </match>
-    </input>
-  </macro>
-  <macro name="directory_result_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/ru/ru.xml b/lang/ru/ru.xml
deleted file mode 100644
index 5f52e76..0000000
--- a/lang/ru/ru.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--тестовые файлы Вы звуковые файлы можно взять тут svn co http://svn.freeswitch.ru/bbv/mod_say_ru/ru/  -->
-<include>
-  <language name="ru" sound-prefix="$${sounds_dir}/ru/RU/elena" tts-engine="cepstral" tts-voice="elena">
-    <phrases>
-      <macros>
-        <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
-        <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. -->
-        <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
-      </macros>
-    </phrases>
-  </language>
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/ru/vm/sounds.xml b/lang/ru/vm/sounds.xml
deleted file mode 100644
index 2ee9e6e..0000000
--- a/lang/ru/vm/sounds.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
-        <!--<action function="say" data="$1" method="pronounced" type="name_spelled"/>-->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
-        <!-- лишнее и так долго <action function="say" data="$1" method="pronounced" type="name_spelled"/>-->
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-hello.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="play-file" data="voicemail/vm-abort.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^(\d+[0,2-9]1|[2-9]1|1):(.*)$"> <!--1, и всё что больше 20-ти 21,31,41 ..   -->
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="MESSAGES"/>
-        <action function="play-file" data="voicemail/vm-$2.wav"/>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <!--<action function="play-file" data="voicemail/vm-in_folder.wav"/>-->
-      </match>
-    </input>
-    <!-- от 10 до 19 и ноль --> <!-- от 5до 9 и больше 20-ти 25-29 -->
-    <input pattern="^(\d+1[0-9]|1[0-9]|0|\d+[0-9][0,5-9]|[2-9][0,5-9]|[0,5-9]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="MESSAGES"/>
-        <action function="play-file" data="voicemail/vm-$2x.wav"/>
-        <action function="play-file" data="voicemail/vm-messagex.wav"/>
-        <!--<action function="play-file" data="voicemail/vm-in_folder.wav"/>-->
-      </match>
-    </input>
-    <input pattern="^(\d+[0,2-9][2-4]|[2-9][2-4]|[2-4]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-you_have.wav"/>
-        <action function="say" data="$1" method="pronounced" type="MESSAGES"/>
-        <action function="play-file" data="voicemail/vm-$2x.wav"/>
-        <action function="play-file" data="voicemail/vm-messages.wav"/>
-        <action function="play-file" data="voicemail/vm-in_folder.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-advanced.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
-        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-change_password.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-continue.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
-        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
-        <action function="play-file" data="voicemail/vm-press.wav"/>
-        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-record_message.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-greeting.wav"/>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-        <action function="play-file" data="voicemail/vm-selected.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-person.wav"/>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-not_available.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(\d+)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(\d+)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-        <action function="play-file" data="voicemail/vm-message_number.wav"/>
-        <action function="say" data="$2" method="pronounced" type="items"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
-      </match>
-    </input>
-  </macro>
-  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
-  <macro name="voicemail_ack">
-    <input pattern="^(too-small)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-too-small.wav"/>
-      </match>
-    </input>
-    <input pattern="^(deleted)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(saved)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(emailed)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-    <input pattern="^(marked-urgent)$">
-      <match>
-        <action function="play-file" data="voicemail/vm-message.wav"/>
-        <action function="play-file" data="voicemail/vm-$1.wav"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/lang/ru/vm/tts.xml b/lang/ru/vm/tts.xml
deleted file mode 100644
index 2de4b37..0000000
--- a/lang/ru/vm/tts.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<include>
-
-  <macro name="voicemail_enter_id">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your i d, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_enter_pass">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="please enter your password, followed by $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_fail_auth">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="login incorrect."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_hello">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="welcome to your voicemail."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_goodbye">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="goodbye."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_abort">
-    <input pattern="(.*)">
-      <match>
-        <action function="speak-text" data="too many failed attempts."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_message_count">
-    <input pattern="^1:(.*)$" break_on_match="true">
-      <match>
-        <action function="speak-text" data="you have 1 $1 message in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-    <input pattern="^(\d+):(.*)$">
-      <match>
-        <action function="speak-text" data="you have $1 $2 messages in folder ${voicemail_current_folder}."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to new messages, press $1, To listen to saved messages, press $2, For advanced options, press $3, to exit, press $4."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_config_menu">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To record a greeting, press $1, To choose a greeting, press $2, To record your name, press $3, to change your password, press $5, to return to the main menu, press $5."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="at the tone, please record your name, press any key or stop talking to end the recording."/>
-
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording, press $1, To save the recording, press $2, To re record, press $3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_urgent_check">
-    <input pattern="^([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To mark this message urgent, press $1, To continue, press $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_invalid_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="$1 is not a valid extension."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_message_enter_extension">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="enter the extension you wish to forward to, then press $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_forward_prepend">
-    <input pattern="^([0-9#*])$">
-      <match>
-        <action function="speak-text" data="To record an announcement, press $1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
-      <match>
-        <action function="speak-text"
-                data="To listen to the recording again, press $1, To save the recording, press $2,  To delete the recording, press $3, to forward the recording to your email, press $4, to call the caller now, press $5, To forward this message to another extension, press $6."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="choose a greeting between 1 and 3."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_choose_greeting_fail">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="invalid value."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your greeting at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_record_message">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="record your message at the tone, press any key or stop talking to end the recording."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="greeting $1 selected."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_play_greeting">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1 is not available."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
-      <match>
-        <action function="speak-text" data="$1 message number $2."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_phone_number">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_name">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="$1."/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_ack">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="message $1"/>
-      </match>
-    </input>
-  </macro>
-
-  <macro name="voicemail_say_date">
-    <input pattern="^(.*)$">
-      <match>
-        <action function="speak-text" data="${strftime($1|%A, %B %d %Y, %I:%M %p)}"/>
-      </match>
-    </input>
-  </macro>
-
-</include>
-<!--
-For Emacs:
-Local Variables:
-mode:xml
-indent-tabs-mode:nil
-tab-width:2
-c-basic-offset:2
-End:
-For VIM:
-vim:set softtabstop=2 shiftwidth=2 tabstop=2 expandtab:
--->
diff --git a/mime.types b/mime.types
deleted file mode 100644
index 34d5fc9..0000000
--- a/mime.types
+++ /dev/null
@@ -1,983 +0,0 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s).  Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type
-# registry is at <http://www.iana.org/assignments/media-types/>.
-
-# MIME type					Extensions
-application/activemessage
-application/andrew-inset			ez
-application/applefile
-application/atom+xml				atom
-application/atomcat+xml				atomcat
-application/atomicmail
-application/atomsvc+xml				atomsvc
-application/auth-policy+xml
-application/batch-smtp
-application/beep+xml
-application/cals-1840
-application/ccxml+xml				ccxml
-application/cellml+xml
-application/cnrp+xml
-application/commonground
-application/conference-info+xml
-application/cpl+xml
-application/csta+xml
-application/cstadata+xml
-application/cybercash
-application/davmount+xml			davmount
-application/dca-rft
-application/dec-dx
-application/dialog-info+xml
-application/dicom
-application/dns
-application/dvcs
-application/ecmascript				ecma
-application/edi-consent
-application/edi-x12
-application/edifact
-application/epp+xml
-application/eshop
-application/fastinfoset
-application/fastsoap
-application/fits
-application/font-tdpfr				pfr
-application/h224
-application/http
-application/hyperstudio				stk
-application/iges
-application/im-iscomposing+xml
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/javascript				js
-application/json				json
-application/kpml-request+xml
-application/kpml-response+xml
-application/mac-binhex40			hqx
-application/mac-compactpro			cpt
-application/macwriteii
-application/marc				mrc
-application/mathematica				ma nb mb
-application/mathml+xml				mathml
-application/mbms-associated-procedure-description+xml
-application/mbms-deregister+xml
-application/mbms-envelope+xml
-application/mbms-msk+xml
-application/mbms-msk-response+xml
-application/mbms-protection-description+xml
-application/mbms-reception-report+xml
-application/mbms-register+xml
-application/mbms-register-response+xml
-application/mbms-user-service-description+xml
-application/mbox				mbox
-application/mediaservercontrol+xml		mscml
-application/mikey
-application/mp4					mp4s
-application/mpeg4-generic
-application/mpeg4-iod
-application/mpeg4-iod-xmt
-application/msword				doc dot
-application/mxf					mxf
-application/nasdata
-application/news-message-id
-application/news-transmission
-application/nss
-application/ocsp-request
-application/ocsp-response
-application/octet-stream bin dms lha lzh class so iso dmg dist distz pkg bpk dump elc
-application/oda					oda
-application/oebps-package+xml
-application/ogg					ogg
-application/parityfec
-application/pdf					pdf
-application/pgp-encrypted			pgp
-application/pgp-keys
-application/pgp-signature			asc sig
-application/pics-rules				prf
-application/pidf+xml
-application/pkcs10				p10
-application/pkcs7-mime				p7m p7c
-application/pkcs7-signature			p7s
-application/pkix-cert				cer
-application/pkix-crl				crl
-application/pkix-pkipath			pkipath
-application/pkixcmp				pki
-application/pls+xml				pls
-application/poc-settings+xml
-application/postscript				ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww				cww
-application/prs.nprend
-application/prs.plucker
-application/qsig
-application/rdf+xml				rdf
-application/reginfo+xml				rif
-application/relax-ng-compact-syntax		rnc
-application/remote-printing
-application/resource-lists+xml			rl
-application/riscos
-application/rlmi+xml
-application/rls-services+xml			rs
-application/rsd+xml				rsd
-application/rss+xml				rss
-application/rtf					rtf
-application/rtx
-application/samlassertion+xml
-application/samlmetadata+xml
-application/sbml+xml				sbml
-application/sdp					sdp
-application/set-payment
-application/set-payment-initiation		setpay
-application/set-registration
-application/set-registration-initiation		setreg
-application/sgml
-application/sgml-open-catalog
-application/shf+xml				shf
-application/sieve
-application/simple-filter+xml
-application/simple-message-summary
-application/simplesymbolcontainer
-application/slate
-application/smil
-application/smil+xml				smi smil
-application/soap+fastinfoset
-application/soap+xml
-application/spirits-event+xml
-application/srgs				gram
-application/srgs+xml				grxml
-application/ssml+xml				ssml
-application/timestamp-query
-application/timestamp-reply
-application/tve-trigger
-application/vemmi
-application/vividence.scriptfile
-application/vnd.3gpp.bsf+xml
-application/vnd.3gpp.pic-bw-large		plb
-application/vnd.3gpp.pic-bw-small		psb
-application/vnd.3gpp.pic-bw-var			pvb
-application/vnd.3gpp.sms
-application/vnd.3gpp2.bcmcsinfo+xml
-application/vnd.3gpp2.sms
-application/vnd.3m.post-it-notes		pwn
-application/vnd.accpac.simply.aso		aso
-application/vnd.accpac.simply.imp		imp
-application/vnd.acucobol			acu
-application/vnd.acucorp				atc acutc
-application/vnd.adobe.xdp+xml			xdp
-application/vnd.adobe.xfdf			xfdf
-application/vnd.aether.imp
-application/vnd.amiga.ami			ami
-application/vnd.anser-web-certificate-issue-initiation	cii
-application/vnd.anser-web-funds-transfer-initiation	fti
-application/vnd.antix.game-component		atx
-application/vnd.apple.installer+xml		mpkg
-application/vnd.audiograph			aep
-application/vnd.autopackage
-application/vnd.avistar+xml
-application/vnd.blueice.multipass		mpm
-application/vnd.bmi				bmi
-application/vnd.businessobjects			rep
-application/vnd.cab-jscript
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.cendio.thinlinc.clientconf
-application/vnd.chemdraw+xml			cdxml
-application/vnd.chipnuts.karaoke-mmd		mmd
-application/vnd.cinderella			cdy
-application/vnd.cirpack.isdn-ext
-application/vnd.claymore			cla
-application/vnd.clonk.c4group			c4g c4d c4f c4p c4u
-application/vnd.commerce-battelle
-application/vnd.commonspace			csp cst
-application/vnd.contact.cmsg			cdbcmsg
-application/vnd.cosmocaller			cmc
-application/vnd.crick.clicker			clkx
-application/vnd.crick.clicker.keyboard		clkk
-application/vnd.crick.clicker.palette		clkp
-application/vnd.crick.clicker.template		clkt
-application/vnd.crick.clicker.wordbank		clkw
-application/vnd.criticaltools.wbs+xml		wbs
-application/vnd.ctc-posml			pml
-application/vnd.cups-pdf
-application/vnd.cups-postscript
-application/vnd.cups-ppd			ppd
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.curl				curl
-application/vnd.cybank
-application/vnd.data-vision.rdz			rdz
-application/vnd.denovo.fcselayout-link		fe_launch
-application/vnd.dna				dna
-application/vnd.dolby.mlp			mlp
-application/vnd.dpgraph				dpg
-application/vnd.dreamfactory			dfac
-application/vnd.dvb.esgcontainer
-application/vnd.dvb.ipdcesgaccess
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart			mag
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven				nml
-application/vnd.epson.esf			esf
-application/vnd.epson.msf			msf
-application/vnd.epson.quickanime		qam
-application/vnd.epson.salt			slt
-application/vnd.epson.ssf			ssf
-application/vnd.ericsson.quickcall
-application/vnd.eszigno3+xml			es3 et3
-application/vnd.eudora.data
-application/vnd.ezpix-album			ez2
-application/vnd.ezpix-package			ez3
-application/vnd.fdf				fdf
-application/vnd.ffsns
-application/vnd.fints
-application/vnd.flographit			gph
-application/vnd.fluxtime.clip			ftc
-application/vnd.framemaker			fm frame maker
-application/vnd.frogans.fnc			fnc
-application/vnd.frogans.ltf			ltf
-application/vnd.fsc.weblaunch			fsc
-application/vnd.fujitsu.oasys			oas
-application/vnd.fujitsu.oasys2			oa2
-application/vnd.fujitsu.oasys3			oa3
-application/vnd.fujitsu.oasysgp			fg5
-application/vnd.fujitsu.oasysprs		bh2
-application/vnd.fujixerox.art-ex
-application/vnd.fujixerox.art4
-application/vnd.fujixerox.hbpl
-application/vnd.fujixerox.ddd			ddd
-application/vnd.fujixerox.docuworks		xdw
-application/vnd.fujixerox.docuworks.binder	xbd
-application/vnd.fut-misnet
-application/vnd.fuzzysheet			fzs
-application/vnd.genomatix.tuxedo		txd
-application/vnd.google-earth.kml+xml		kml
-application/vnd.google-earth.kmz		kmz
-application/vnd.grafeq				gqf gqs
-application/vnd.gridmp
-application/vnd.groove-account			gac
-application/vnd.groove-help			ghf
-application/vnd.groove-identity-message		gim
-application/vnd.groove-injector			grv
-application/vnd.groove-tool-message		gtm
-application/vnd.groove-tool-template		tpl
-application/vnd.groove-vcard			vcg
-application/vnd.handheld-entertainment+xml	zmm
-application/vnd.hbci				hbci
-application/vnd.hcl-bireports
-application/vnd.hhe.lesson-player		les
-application/vnd.hp-hpgl				hpgl
-application/vnd.hp-hpid				hpid
-application/vnd.hp-hps				hps
-application/vnd.hp-jlyt				jlt
-application/vnd.hp-pcl				pcl
-application/vnd.hp-pclxl			pclxl
-application/vnd.httphone
-application/vnd.hzn-3d-crossword		x3d
-application/vnd.ibm.afplinedata
-application/vnd.ibm.electronic-media
-application/vnd.ibm.minipay			mpy
-application/vnd.ibm.modcap			afp listafp list3820
-application/vnd.ibm.rights-management		irm
-application/vnd.ibm.secure-container		sc
-application/vnd.igloader			igl
-application/vnd.immervision-ivp			ivp
-application/vnd.immervision-ivu			ivu
-application/vnd.informedcontrol.rms+xml
-application/vnd.intercon.formnet		xpw xpx
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo			qbo
-application/vnd.intu.qfx			qfx
-application/vnd.ipunplugged.rcprofile		rcprofile
-application/vnd.irepository.package+xml		irp
-application/vnd.is-xpr				xpr
-application/vnd.jam				jam
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.jcp.javame.midlet-rms		rms
-application/vnd.jisp				jisp
-application/vnd.kahootz				ktz ktr
-application/vnd.kde.karbon			karbon
-application/vnd.kde.kchart			chrt
-application/vnd.kde.kformula			kfo
-application/vnd.kde.kivio			flw
-application/vnd.kde.kontour			kon
-application/vnd.kde.kpresenter			kpr kpt
-application/vnd.kde.kspread			ksp
-application/vnd.kde.kword			kwd kwt
-application/vnd.kenameaapp			htke
-application/vnd.kidspiration			kia
-application/vnd.kinar				kne knp
-application/vnd.koan				skp skd skt skm
-application/vnd.liberty-request+xml
-application/vnd.llamagraphics.life-balance.desktop	lbd
-application/vnd.llamagraphics.life-balance.exchange+xml	lbe
-application/vnd.lotus-1-2-3			123
-application/vnd.lotus-approach			apr
-application/vnd.lotus-freelance			pre
-application/vnd.lotus-notes			nsf
-application/vnd.lotus-organizer			org
-application/vnd.lotus-screencam			scm
-application/vnd.lotus-wordpro			lwp
-application/vnd.macports.portpkg		portpkg
-application/vnd.marlin.drm.actiontoken+xml
-application/vnd.marlin.drm.conftoken+xml
-application/vnd.marlin.drm.mdcf
-application/vnd.mcd				mcd
-application/vnd.medcalcdata			mc1
-application/vnd.mediastation.cdkey		cdkey
-application/vnd.meridian-slingshot
-application/vnd.mfer				mwf
-application/vnd.mfmp				mfm
-application/vnd.micrografx.flo			flo
-application/vnd.micrografx.igx			igx
-application/vnd.mif				mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf			daf
-application/vnd.mobius.dis			dis
-application/vnd.mobius.mbk			mbk
-application/vnd.mobius.mqy			mqy
-application/vnd.mobius.msl			msl
-application/vnd.mobius.plc			plc
-application/vnd.mobius.txf			txf
-application/vnd.mophun.application		mpn
-application/vnd.mophun.certificate		mpc
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml	xul
-application/vnd.ms-artgalry			cil
-application/vnd.ms-asf				asf
-application/vnd.ms-cab-compressed		cab
-application/vnd.ms-excel			xls xlm xla xlc xlt xlw
-application/vnd.ms-fontobject			eot
-application/vnd.ms-htmlhelp			chm
-application/vnd.ms-ims				ims
-application/vnd.ms-lrm				lrm
-application/vnd.ms-playready.initiator+xml
-application/vnd.ms-powerpoint			ppt pps pot
-application/vnd.ms-project			mpp mpt
-application/vnd.ms-tnef
-application/vnd.ms-wmdrm.lic-chlg-req
-application/vnd.ms-wmdrm.lic-resp
-application/vnd.ms-wmdrm.meter-chlg-req
-application/vnd.ms-wmdrm.meter-resp
-application/vnd.ms-works			wps wks wcm wdb
-application/vnd.ms-wpl				wpl
-application/vnd.ms-xpsdocument			xps
-application/vnd.mseq				mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician			mus
-application/vnd.ncd.control
-application/vnd.nervana
-application/vnd.netfpx
-application/vnd.neurolanguage.nlu		nlu
-application/vnd.noblenet-directory		nnd
-application/vnd.noblenet-sealer			nns
-application/vnd.noblenet-web			nnw
-application/vnd.nokia.catalogs
-application/vnd.nokia.conml+wbxml
-application/vnd.nokia.conml+xml
-application/vnd.nokia.isds-radio-presets
-application/vnd.nokia.iptv.config+xml
-application/vnd.nokia.landmark+wbxml
-application/vnd.nokia.landmark+xml
-application/vnd.nokia.landmarkcollection+xml
-application/vnd.nokia.n-gage.ac+xml
-application/vnd.nokia.n-gage.data		ngdat
-application/vnd.nokia.n-gage.symbian.install	n-gage
-application/vnd.nokia.ncd
-application/vnd.nokia.pcd+wbxml
-application/vnd.nokia.pcd+xml
-application/vnd.nokia.radio-preset		rpst
-application/vnd.nokia.radio-presets		rpss
-application/vnd.novadigm.edm			edm
-application/vnd.novadigm.edx			edx
-application/vnd.novadigm.ext			ext
-application/vnd.oasis.opendocument.chart		odc
-application/vnd.oasis.opendocument.chart-template	otc
-application/vnd.oasis.opendocument.formula		odf
-application/vnd.oasis.opendocument.formula-template	otf
-application/vnd.oasis.opendocument.graphics		odg
-application/vnd.oasis.opendocument.graphics-template	otg
-application/vnd.oasis.opendocument.image		odi
-application/vnd.oasis.opendocument.image-template	oti
-application/vnd.oasis.opendocument.presentation		odp
-application/vnd.oasis.opendocument.presentation-template otp
-application/vnd.oasis.opendocument.spreadsheet		ods
-application/vnd.oasis.opendocument.spreadsheet-template	ots
-application/vnd.oasis.opendocument.text			odt
-application/vnd.oasis.opendocument.text-master		otm
-application/vnd.oasis.opendocument.text-template	ott
-application/vnd.oasis.opendocument.text-web		oth
-application/vnd.obn
-application/vnd.olpc-sugar			xo
-application/vnd.oma-scws-config
-application/vnd.oma-scws-http-request
-application/vnd.oma-scws-http-response
-application/vnd.oma.bcast.associated-procedure-parameter+xml
-application/vnd.oma.bcast.drm-trigger+xml
-application/vnd.oma.bcast.imd+xml
-application/vnd.oma.bcast.notification+xml
-application/vnd.oma.bcast.sgboot
-application/vnd.oma.bcast.sgdd+xml
-application/vnd.oma.bcast.sgdu
-application/vnd.oma.bcast.simple-symbol-container
-application/vnd.oma.bcast.smartcard-trigger+xml
-application/vnd.oma.bcast.sprov+xml
-application/vnd.oma.dd2+xml			dd2
-application/vnd.oma.drm.risd+xml
-application/vnd.oma.group-usage-list+xml
-application/vnd.oma.poc.groups+xml
-application/vnd.oma.xcap-directory+xml
-application/vnd.omads-email+xml
-application/vnd.omads-file+xml
-application/vnd.omads-folder+xml
-application/vnd.omaloc-supl-init
-application/vnd.openofficeorg.extension		oxt
-application/vnd.osa.netdeploy
-application/vnd.osgi.dp				dp
-application/vnd.otps.ct-kip+xml
-application/vnd.palm				prc pdb pqa oprc
-application/vnd.paos.xml
-application/vnd.pg.format			str
-application/vnd.pg.osasli			ei6
-application/vnd.piaccess.application-licence
-application/vnd.picsel				efif
-application/vnd.poc.group-advertisement+xml
-application/vnd.pocketlearn			plf
-application/vnd.powerbuilder6			pbd
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.preminet
-application/vnd.previewsystems.box		box
-application/vnd.proteus.magazine		mgz
-application/vnd.publishare-delta-tree		qps
-application/vnd.pvi.ptid1			ptid
-application/vnd.pwg-multiplexed
-application/vnd.pwg-xhtml-print+xml
-application/vnd.qualcomm.brew-app-res
-application/vnd.quark.quarkxpress		qxd qxt qwd qwt qxl qxb
-application/vnd.rapid
-application/vnd.recordare.musicxml		mxl
-application/vnd.recordare.musicxml+xml
-application/vnd.renlearn.rlprint
-application/vnd.rn-realmedia			rm
-application/vnd.ruckus.download
-application/vnd.s3sms
-application/vnd.scribus
-application/vnd.sealed.3df
-application/vnd.sealed.csf
-application/vnd.sealed.doc
-application/vnd.sealed.eml
-application/vnd.sealed.mht
-application/vnd.sealed.net
-application/vnd.sealed.ppt
-application/vnd.sealed.tiff
-application/vnd.sealed.xls
-application/vnd.sealedmedia.softseal.html
-application/vnd.sealedmedia.softseal.pdf
-application/vnd.seemail				see
-application/vnd.sema				sema
-application/vnd.semd				semd
-application/vnd.semf				semf
-application/vnd.shana.informed.formdata		ifm
-application/vnd.shana.informed.formtemplate	itp
-application/vnd.shana.informed.interchange	iif
-application/vnd.shana.informed.package		ipk
-application/vnd.simtech-mindmapper		twd twds
-application/vnd.smaf				mmf
-application/vnd.solent.sdkm+xml			sdkm sdkd
-application/vnd.spotfire.dxp			dxp
-application/vnd.spotfire.sfs			sfs
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.sun.wadl+xml
-application/vnd.sus-calendar			sus susp
-application/vnd.svd				svd
-application/vnd.swiftview-ics
-application/vnd.syncml+xml			xsm
-application/vnd.syncml.dm+wbxml			bdm
-application/vnd.syncml.dm+xml			xdm
-application/vnd.syncml.ds.notification
-application/vnd.tao.intent-module-archive	tao
-application/vnd.tmobile-livetv			tmo
-application/vnd.trid.tpt			tpt
-application/vnd.triscape.mxs			mxs
-application/vnd.trueapp				tra
-application/vnd.truedoc
-application/vnd.ufdl				ufd ufdl
-application/vnd.uiq.theme			utz
-application/vnd.umajin				umj
-application/vnd.unity				unityweb
-application/vnd.uoml+xml			uoml
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx				vcx
-application/vnd.vd-study
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio				vsd vst vss vsw
-application/vnd.visionary			vis
-application/vnd.vividence.scriptfile
-application/vnd.vsf				vsf
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml			wbxml
-application/vnd.wap.wmlc			wmlc
-application/vnd.wap.wmlscriptc			wmlsc
-application/vnd.webturbo			wtb
-application/vnd.wfa.wsc
-application/vnd.wordperfect			wpd
-application/vnd.wqd				wqd
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf				stf
-application/vnd.wv.csp+wbxml
-application/vnd.wv.csp+xml
-application/vnd.wv.ssp+xml
-application/vnd.xara				xar
-application/vnd.xfdl				xfdl
-application/vnd.xmpie.cpkg
-application/vnd.xmpie.dpkg
-application/vnd.xmpie.plan
-application/vnd.xmpie.ppkg
-application/vnd.xmpie.xlim
-application/vnd.yamaha.hv-dic			hvd
-application/vnd.yamaha.hv-script		hvs
-application/vnd.yamaha.hv-voice			hvp
-application/vnd.yamaha.smaf-audio		saf
-application/vnd.yamaha.smaf-phrase		spf
-application/vnd.yellowriver-custom-menu		cmp
-application/vnd.zzazz.deck+xml			zaz
-application/voicexml+xml			vxml
-application/watcherinfo+xml
-application/whoispp-query
-application/whoispp-response
-application/winhlp				hlp
-application/wita
-application/wordperfect5.1
-application/wsdl+xml				wsdl
-application/wspolicy+xml			wspolicy
-application/x-ace-compressed			ace
-application/x-bcpio				bcpio
-application/x-bittorrent			torrent
-application/x-bzip				bz
-application/x-bzip2				bz2 boz
-application/x-cdlink				vcd
-application/x-chat				chat
-application/x-chess-pgn				pgn
-application/x-compress
-application/x-cpio				cpio
-application/x-csh				csh
-application/x-director				dcr dir dxr fgd
-application/x-dvi				dvi
-application/x-futuresplash			spl
-application/x-gtar				gtar
-application/x-gzip
-application/x-hdf				hdf
-application/x-latex				latex
-application/x-ms-wmd				wmd
-application/x-ms-wmz				wmz
-application/x-msaccess				mdb
-application/x-msbinder				obd
-application/x-mscardfile			crd
-application/x-msclip				clp
-application/x-msdownload			exe dll com bat msi
-application/x-msmediaview			mvb m13 m14
-application/x-msmetafile			wmf
-application/x-msmoney				mny
-application/x-mspublisher			pub
-application/x-msschedule			scd
-application/x-msterminal			trm
-application/x-mswrite				wri
-application/x-netcdf				nc cdf
-application/x-pkcs12				p12 pfx
-application/x-pkcs7-certificates		p7b spc
-application/x-pkcs7-certreqresp			p7r
-application/x-rar-compressed			rar
-application/x-sh				sh
-application/x-shar				shar
-application/x-shockwave-flash			swf
-application/x-stuffit				sit
-application/x-stuffitx				sitx
-application/x-sv4cpio				sv4cpio
-application/x-sv4crc				sv4crc
-application/x-tar				tar
-application/x-tcl				tcl
-application/x-tex				tex
-application/x-texinfo				texinfo texi
-application/x-ustar				ustar
-application/x-wais-source			src
-application/x-x509-ca-cert			der crt
-application/x400-bp
-application/xcap-att+xml
-application/xcap-caps+xml
-application/xcap-el+xml
-application/xcap-error+xml
-application/xcap-ns+xml
-application/xenc+xml				xenc
-application/xhtml+xml				xhtml xht
-application/xml					xml xsl
-application/xml-dtd				dtd
-application/xml-external-parsed-entity
-application/xmpp+xml
-application/xop+xml				xop
-application/xslt+xml				xslt
-application/xspf+xml				xspf
-application/xv+xml				mxml xhvml xvml xvm
-application/zip					zip
-audio/32kadpcm
-audio/3gpp
-audio/3gpp2
-audio/ac3
-audio/amr
-audio/amr-wb
-audio/amr-wb+
-audio/asc
-audio/basic					au snd
-audio/bv16
-audio/bv32
-audio/clearmode
-audio/cn
-audio/dat12
-audio/dls
-audio/dsr-es201108
-audio/dsr-es202050
-audio/dsr-es202211
-audio/dsr-es202212
-audio/dvi4
-audio/eac3
-audio/evrc
-audio/evrc-qcp
-audio/evrc0
-audio/evrc1
-audio/evrcb
-audio/evrcb0
-audio/evrcb1
-audio/g722
-audio/g7221
-audio/g723
-audio/g726-16
-audio/g726-24
-audio/g726-32
-audio/g726-40
-audio/g728
-audio/g729
-audio/g7291
-audio/g729d
-audio/g729e
-audio/gsm
-audio/gsm-efr
-audio/ilbc
-audio/l16
-audio/l20
-audio/l24
-audio/l8
-audio/lpc
-audio/midi					mid midi kar rmi
-audio/mobile-xmf
-audio/mp4					mp4a
-audio/mp4a-latm
-audio/mpa
-audio/mpa-robust
-audio/mpeg					mpga mp2 mp2a mp3 m2a m3a
-audio/mpeg4-generic
-audio/parityfec
-audio/pcma
-audio/pcmu
-audio/prs.sid
-audio/qcelp
-audio/red
-audio/rtp-enc-aescm128
-audio/rtp-midi
-audio/rtx
-audio/smv
-audio/smv0
-audio/smv-qcp
-audio/sp-midi
-audio/t140c
-audio/t38
-audio/telephone-event
-audio/tone
-audio/vdvi
-audio/vmr-wb
-audio/vnd.3gpp.iufp
-audio/vnd.4sb
-audio/vnd.audiokoz
-audio/vnd.celp
-audio/vnd.cisco.nse
-audio/vnd.cmles.radio-events
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds				eol
-audio/vnd.dlna.adts
-audio/vnd.dolby.mlp
-audio/vnd.everad.plj
-audio/vnd.hns.audio
-audio/vnd.lucent.voice				lvp
-audio/vnd.nokia.mobile-xmf
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800			ecelp4800
-audio/vnd.nuera.ecelp7470			ecelp7470
-audio/vnd.nuera.ecelp9600			ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.sealedmedia.softseal.mpeg
-audio/vnd.vmx.cvsd
-audio/wav					wav
-audio/x-aiff					aif aiff aifc
-audio/x-mpegurl					m3u
-audio/x-ms-wax					wax
-audio/x-ms-wma					wma
-audio/x-pn-realaudio				ram ra
-audio/x-pn-realaudio-plugin			rmp
-audio/x-wav					wav
-chemical/x-cdx					cdx
-chemical/x-cif					cif
-chemical/x-cmdf					cmdf
-chemical/x-cml					cml
-chemical/x-csml					csml
-chemical/x-pdb					pdb
-chemical/x-xyz					xyz
-image/bmp					bmp
-image/cgm					cgm
-image/fits
-image/g3fax					g3
-image/gif					gif
-image/ief					ief
-image/jp2
-image/jpeg					jpeg jpg jpe
-image/jpm
-image/jpx
-image/naplps
-image/png					png
-image/prs.btif					btif
-image/prs.pti
-image/svg+xml					svg svgz
-image/t38
-image/tiff					tiff tif
-image/tiff-fx
-image/vnd.adobe.photoshop			psd
-image/vnd.cns.inf2
-image/vnd.djvu					djvu djv
-image/vnd.dwg					dwg
-image/vnd.dxf					dxf
-image/vnd.fastbidsheet				fbs
-image/vnd.fpx					fpx
-image/vnd.fst					fst
-image/vnd.fujixerox.edmics-mmr			mmr
-image/vnd.fujixerox.edmics-rlc			rlc
-image/vnd.globalgraphics.pgb
-image/vnd.microsoft.icon			ico
-image/vnd.mix
-image/vnd.ms-modi				mdi
-image/vnd.net-fpx				npx
-image/vnd.sealed.png
-image/vnd.sealedmedia.softseal.gif
-image/vnd.sealedmedia.softseal.jpg
-image/vnd.svf
-image/vnd.wap.wbmp				wbmp
-image/vnd.xiff					xif
-image/x-cmu-raster				ras
-image/x-cmx					cmx
-image/x-icon
-image/x-pcx					pcx
-image/x-pict					pic pct
-image/x-portable-anymap				pnm
-image/x-portable-bitmap				pbm
-image/x-portable-graymap			pgm
-image/x-portable-pixmap				ppm
-image/x-rgb					rgb
-image/x-xbitmap					xbm
-image/x-xpixmap					xpm
-image/x-xwindowdump				xwd
-message/cpim
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822					eml mime
-message/s-http
-message/sip
-message/sipfrag
-message/tracking-status
-model/iges					igs iges
-model/mesh					msh mesh silo
-model/vnd.dwf					dwf
-model/vnd.flatland.3dml
-model/vnd.gdl					gdl
-model/vnd.gs.gdl
-model/vnd.gtw					gtw
-model/vnd.moml+xml
-model/vnd.mts					mts
-model/vnd.parasolid.transmit.binary
-model/vnd.parasolid.transmit.text
-model/vnd.vtu					vtu
-model/vrml					wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar					ics ifb
-text/css					css
-text/csv					csv
-text/directory
-text/dns
-text/enriched
-text/html					html htm
-text/parityfec
-text/plain					txt text conf def list log in
-text/prs.fallenstein.rst
-text/prs.lines.tag				dsc
-text/red
-text/rfc822-headers
-text/richtext					rtx
-text/rtf
-text/rtp-enc-aescm128
-text/rtx
-text/sgml					sgml sgm
-text/t140
-text/tab-separated-values			tsv
-text/troff					t tr roff man me ms
-text/uri-list					uri uris urls
-text/vnd.abc
-text/vnd.curl
-text/vnd.dmclientscript
-text/vnd.esmertec.theme-descriptor
-text/vnd.fly					fly
-text/vnd.fmi.flexstor				flx
-text/vnd.in3d.3dml				3dml
-text/vnd.in3d.spot				spot
-text/vnd.iptc.newsml
-text/vnd.iptc.nitf
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.net2phone.commcenter.command
-text/vnd.sun.j2me.app-descriptor		jad
-text/vnd.trolltech.linguist
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml				wml
-text/vnd.wap.wmlscript				wmls
-text/x-asm					s asm
-text/x-c					c cc cxx cpp h hh dic
-text/x-fortran					f for f77 f90
-text/x-pascal					p pas
-text/x-java-source				java
-text/x-setext					etx
-text/x-uuencode					uu
-text/x-vcalendar				vcs
-text/x-vcard					vcf
-text/xml
-text/xml-external-parsed-entity
-video/3gpp					3gp
-video/3gpp-tt
-video/3gpp2					3g2
-video/bmpeg
-video/bt656
-video/celb
-video/dv
-video/h261					h261
-video/h263					h263
-video/h263-1998
-video/h263-2000
-video/h264					h264
-video/jpeg					jpgv
-video/jpm					jpm jpgm
-video/mj2					mj2 mjp2
-video/mp1s
-video/mp2p
-video/mp2t
-video/mp4					mp4 mp4v mpg4
-video/mp4v-es
-video/mpeg					mpeg mpg mpe m1v m2v
-video/mpeg4-generic
-video/mpv
-video/nv
-video/parityfec
-video/pointer
-video/quicktime					qt mov
-video/raw
-video/rtp-enc-aescm128
-video/rtx
-video/smpte292m
-video/vc1
-video/vnd.dlna.mpeg-tts
-video/vnd.fvt					fvt
-video/vnd.hns.video
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl				mxu m4u
-video/vnd.nokia.interleaved-multimedia
-video/vnd.nokia.videovoip
-video/vnd.objectvideo
-video/vnd.sealed.mpeg1
-video/vnd.sealed.mpeg4
-video/vnd.sealed.swf
-video/vnd.sealedmedia.softseal.mov
-video/vnd.vivo					viv
-video/x-fli					fli
-video/x-ms-asf					asf asx
-video/x-ms-wm					wm
-video/x-ms-wmv					wmv
-video/x-ms-wmx					wmx
-video/x-ms-wvx					wvx
-video/x-msvideo					avi
-video/x-sgi-movie				movie
-x-conference/x-cooltalk				ice
diff --git a/sip_profiles/sipinterface_1.xml b/sip_profiles/sipinterface_1.xml
deleted file mode 100644
index 987e115..0000000
--- a/sip_profiles/sipinterface_1.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<include>
-    <profile name="sipinterface_1">
-
-        <settings>
-            <!-- Preformance -->
-            <param name="message-threads" value="10"/>
-
-            <!-- ACL -->
-            <param name="auth-calls" value="true"/>
-            <param name="apply-nat-acl" value="rfc1918.auto"/>
-            <param name="apply-inbound-acl" value="trusted"/>
-            <param name="apply-proxy-acl" value="authoritative"/>
-            <param name="local-network-acl" value="localnet.auto"/>
-            <!--<param name="apply-register-acl" value="domains"/>-->
-
-
-            <!-- Authentication -->
-            <param name="challenge-realm" value="auto_from"/>
-            <param name="multiple-registrations" value="false"/>
-            <!--<param name="max-registrations-per-extension" value="1"/>-->
-            <param name="accept-blind-reg" value="false"/>
-            <param name="accept-blind-auth" value="false"/>
-            <param name="nonce-ttl" value="86400"/>
-            <param name="disable-register" value="false"/>
-            <!--<param name="NDLB-broken-auth-hash" value="true"/>-->
-            <param name="inbound-reg-force-matching-username" value="true"/>
-            <param name="auth-all-packets" value="false"/>
-            <!--<param name="user-agent-filter" value=""/>-->
-            <!--<param name="force-register-domain" value="sip.2600hz.com"/>-->
-            <!--<param name="force-register-db-domain" value="sip.2600hz.com"/>-->
-
-
-            <!-- Routing -->
-            <!--<param name="username" value="default"/>-->
-            <param name="context" value="context_2"/>
-            <param name="dialplan" value="XML"/>
-            <!--<param name="full-id-in-dialplan" value="false"/>-->
-            <param name="manual-redirect" value="false"/>
-            <param name="disable-transfer" value="false"/>
-
-
-            <!-- SIP -->
-            <param name="sip-ip" value="$${local_ip_v4}"/>
-            <param name="ext-sip-ip" value="auto"/>
-            <param name="sip-port" value="5060"/>            
-            <!--<param name="outbound-proxy" value="127.0.0.1"/>-->
-            <!--<param name="sip-domain" value="sip.2600hz.com"/>-->
-            <!--<param name="contact-user" value="sip.2600hz.com"/>-->
-            <param name="user-agent-string" value="2600hz"/>
-            <param name="enable-100rel" value="false"/>
-            <param name="max-proceeding" value="1000"/>
-            <!--<param name="max-calls" value="250"/>-->
-            <!--<param name="track-calls" value="true"/>-->
-            <param name="inbound-use-callid-as-uuid" value="true"/>
-            <param name="outbound-use-uuid-as-callid" value="true"/>
-            <!--<param name="bind-params" value="transport=udp"/>-->
-            <!--<param name="enable-compact-headers" value="true"/>-->
-            <!--<param name="extended-info-parsing" value="true"/>-->
-            <!--<param name="enable-soa" value="false" />-->
-            <!--<param name="disable-srv" value="false" />-->
-            <!--<param name="disable-naptr" value="false" />-->
-            <!--<param name="enable-3pcc" value="true"/>-->
-
-
-            <!-- Media -->
-            <param name="rtp-ip" value="$${local_ip_v4}"/>
-            <param name="ext-rtp-ip" value="auto"/>
-            <param name="rtp-timer-name" value="soft"/>
-            <param name="rtp-autoflush-during-bridge" value="true"/>
-            <param name="rtp-rewrite-timestamps" value="false"/>
-            <!--<param name="disable-rtp-auto-adjust" value="true"/>-->
-            <!--<param name="rtp-autofix-timing" value="false"/>-->
-            <!--<param name="auto-rtp-bugs" data="clear"/>-->
-            <!--<param name="inbound-bypass-media" value="true"/>-->
-            <!--<param name="media-option" value="resume-media-on-hold"/>-->
-            <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
-            <param name="hold-music" value="local_stream://default"/>
-            <!--<param name="suppress-cng" value="true"/>-->
-            <!--<param name="cng-pt" value="13"/>-->
-            <!--<param name="ignore-183nosdp" value="false"/>-->
-            <!--<param name="vad" value="out"/>-->
-            <param name="record-path" value="$${recordings_dir}"/>
-            <param name="record-template" value="${caller_id_number}.${target_domain}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
-            <!--<param name="NDLB-sendrecv-in-session" value="true"/>-->
-            <!--<param name="NDLB-support-asterisk-missing-srtp-auth" value="true"/>-->
-            <!--<param name="require-secure-rtp" value="true"/>-->            
-            <!--<param name="auto-jitterbuffer-msec" value="120"/>-->
-
-
-            <!-- TLS -->
-            <!--<param name="tls" value="true"/>
-            <param name="tls-only" value="false"/>
-            <param name="tls-bind-params" value="transport=tls"/>
-            <param name="tls-sip-port" value="5070"/>
-            <param name="tls-version" value="tlsv1"/>
-            <param name="tls-bind-params" value="transport=tls"/>
-            <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>
-            <param name="tls-passphrase" value=""/>
-            <param name="tls-verify-date" value="true"/>
-            <param name="tls-verify-policy" value="none"/>
-            <param name="tls-verify-depth" value="2"/>
-            <param name="tls-verify-in-subjects" value=""/>
-            <param name="tls-version" value="$${sip_tls_version}"/>-->
-
-
-            <!-- DTMF -->
-            <param name="dtmf-duration" value="960"/>
-            <param name="rfc2833-pt" value="101"/>
-            <param name="dtmf-type" value="rfc2833"/>
-            <param name="pass-rfc2833" value="false"/>
-
-
-            <!-- Codecs -->
-            <!--<param name="codec-prefs" value="$${codecs}"/>-->
-            <param name="inbound-codec-prefs" value="$${codecs}"/>
-            <param name="outbound-codec-prefs" value="$${codecs}"/>
-            <param name="inbound-codec-negotiation" value="greedy"/>
-            <param name="inbound-late-negotiation" value="true"/>
-            <!--<param name="bitpacking" value="aal2"/> -->
-            <param name="disable-transcoding" value="false"/>
-            <!--<param name="NDLB-allow-bad-iananame" value="true"/>-->
-            <param name="t38-passthru" value="true"/>
-
-
-            <!-- NAT -->
-            <!--<param name="nat-options-ping" value="true"/>-->
-            <param name="all-reg-options-ping" value="true"/>
-            <!--<param name="unregister-on-options-fail" value="true"/>-->
-            <!--<param name="aggressive-nat-detection" value="true"/>-->
-            <!--<param name="NDLB-force-rport" value="safe"/>-->
-            <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
-            <!--<param name="NDLB-funny-stun" value="true"/>-->
-            <!--<param name="stun-enabled" value="true"/>-->
-            <!--<param name="stun-auto-disable" value="true"/>-->
-
-
-            <!-- Session Timers -->
-            <param name="enable-timer" value="false"/>
-            <param name="rtp-timeout-sec" value="3600"/>
-            <param name="rtp-hold-timeout-sec" value="3600"/>
-            <param name="minimum-session-expires" value="120"/>
-            <!--<param name="sip-force-expires" value="600"/>-->
-            <!--<param name="sip-expires-max-deviation" value="120"/>-->
-            <!--<param name="session-timeout" value="120"/>-->
-            <!--<param name="timer-T1" value="500"/>-->
-            <!--<param name="timer-T1X64" value="32000"/>-->
-            <!--<param name="timer-T2" value="4000"/>-->
-            <!--<param name="timer-T4" value="4000"/> -->
-
-
-            <!-- CID -->
-            <!--<param name="cid-in-1xx" value="false"/>-->
-            <!--<param name="caller-id-type" value="rpid"/>-->
-            <!--<param name="pass-callee-id" value="false"/>-->
-
-
-            <!-- Subscription and Presence -->
-            <param name="manage-presence" value="true"/>
-            <!--<param name="delete-subs-on-register" value="false"/>-->
-            <!--<param name="manage-shared-appearance" value="true"/>-->
-            <!--<param name="dbname" value="share_presence"/>-->
-            <!--<param name="presence-hosts" value=".2600hz.org"/>-->
-            <!--<param name="force-subscription-expires" value="600"/>-->
-            <param name="send-message-query-on-register" value="false"/>
-            <!--<param name="send-presence-on-register" value="true"/> -->
-            <!--<param name="force-publish-expires" value="true"/>-->
-            <!--<param name="forward-unsolicited-mwi-notify" value="true"/>-->
-            <!--<param name="presence-probe-on-register" value="true"/>-->
-            <!--<param name="in-dialog-chat" value="true"/>-->
-
-
-            <!-- ODBC -->
-            <!--<param name="odbc-dsn" value="fs_sofia"/>-->
-            <!--<param name="sql-in-transactions" value="true"/>--> -->
-
-
-            <!-- Watchdog -->
-            <param name="watchdog-enabled" value="false"/>
-            <!--<param name="watchdog-step-timeout" value="30000"/>-->
-            <!--<param name="watchdog-event-timeout" value="30000"/>-->
-
-
-            <!-- LOGGING -->
-            <param name="debug" value="info"/>
-            <param name="sip-trace" value="true"/>
-            <param name="log-auth-failures" value="true"/>
-        </settings>
-        <gateways>
-            <X-PRE-PROCESS cmd="include" data="/etc/freeswitch/gateways/*.xml"/>
-        </gateways>
-    </profile>
-</include>