diff --git a/tools/xmlGenerator/hostConfig.py b/tools/xmlGenerator/hostConfig.py
deleted file mode 100755
index 871f8f247..000000000
--- a/tools/xmlGenerator/hostConfig.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python
-# -*-coding:utf-8 -*
-
-# Copyright (c) 2011-2014, Intel Corporation
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation and/or
-# other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import xml.dom.minidom
-import sys
-
-def configure(infile=sys.stdin, outfile=sys.stdout, serverPort=None, structPath=None):
-    """ Format an xml PFW config file (standard input) for simulation.
-
-    Allow tuning on @serverPort port, remove the plugins and settings need,
-    and change the structure path to absolute."""
-
-    dom = xml.dom.minidom.parse(infile)
-
-    for node in dom.getElementsByTagName("ParameterFrameworkConfiguration"):
-        if serverPort is not None:
-            node.setAttribute("ServerPort", serverPort)
-        node.setAttribute("TuningAllowed", "true")
-
-    def delete(tag):
-        for node in dom.getElementsByTagName(tag):
-            node.parentNode.removeChild(node)
-    delete("Location")
-    delete("SettingsConfiguration")
-
-    if structPath is not None:
-        for node in dom.getElementsByTagName("StructureDescriptionFileLocation"):
-            node.setAttribute("Path", structPath + "/" + node.getAttribute("Path"))
-
-    outfile.write(dom.toxml())
-
-if __name__ == "__main__" :
-    """ Execute main if the python interpreter is running this module as the main program """
-
-    configure(serverPort=sys.argv[1], structPath=sys.argv[2])
-
diff --git a/tools/xmlGenerator/lightRoutingUpdate.sh b/tools/xmlGenerator/lightRoutingUpdate.sh
deleted file mode 100755
index 7403622b1..000000000
--- a/tools/xmlGenerator/lightRoutingUpdate.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2014, Intel Corporation
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation and/or
-# other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# This script generate an xml from a .pfw in an easy and fast way
-# It only works if you have an parameter running with criterion compatible
-# with the .pfw
-
-set -eu -o pipefail
-
-adbShell="adb shell"
-parameterCommandAccess="eval remote-process localhost 5000"
-parameter="$adbShell $parameterCommandAccess"
-
-tmpfile="/tmp/pfw_commands"
-target_tmpfile="/data/pfw_commands"
-
-
-adbShellForward () {
-
-    echo 'echo $?; exit' >> "$1"
-
-    # Send commands
-    adb push "$1" "$target_tmpfile"
-    $adbShell chmod 700 "$target_tmpfile"
-
-    $adbShell "$target_tmpfile" |
-        # keep only the -2 line, the output of "echo $?"
-        tee /dev/stderr | tail -2 | sed '1{s/\r//;q}' |
-        # stop if $? != 0 (as of set -e)
-        xargs test 0 -eq 2> /dev/null
-
-}
-
-function parameterExecute ()
-{
-    echo "   \$ $parameter $@"
-    result="$($parameter $@ | sed 's/\r$//')"
-
-    if [[ "$result" != "Done"* ]]; then
-         echo "$result"
-         return 2
-    fi
-    return 0
-}
-
-function log ()
-{
-    echo "$@" >&2
-}
-
-# Clean tmp file
-echo > "${tmpfile}"
-
-#################
-# Configure PFW #
-#################
-
-echo "setTuningMode on" >> "${tmpfile}"
-echo "setAutoSync off"  >> "${tmpfile}"
-
-
-log "Delete routing domains"
-for domain in $(parameterExecute listDomains |grep -io '^Routing.[^ ]*')
-do
-    log "Will delete domain $domain"
-    echo "deleteDomain $domain" >> "${tmpfile}"
-done
-
-#########################
-# Generate PFW commands #
-#########################
-
-log "Generate domain commands from file(s): $*"
-m4 "$@" \
-    | $(dirname $0)/PFWScriptGenerator.py --output-kind pfw  >> "${tmpfile}"
-
-
-echo "setAutoSync off" >> "${tmpfile}"
-echo "setTuningMode off" >> "${tmpfile}"
-
-sed -i -e':a
-      # look for line finishing with \
-      /\\$/{
-        # Delete the last char (\)
-        s/\\$//;
-        # Append the next line and delete the \n separator
-        N;
-        s/\n/ /;
-        # Jump back to the expression beginning
-        ta;
-      };
-      # delete empty lines;
-      /^$/d
-      # delete leading space
-      s/^ *//
-      # delete multiple spaces
-      s/  */ /g;
-      # Prefix each line with "$parameterCommandAccess
-      '"s/^/$parameterCommandAccess /" \
-  "${tmpfile}"
-
-echo "set -xeu" > "${tmpfile}2"
-cat "${tmpfile}" >> "${tmpfile}2"
-
-log "Execute commands"
-adbShellForward "${tmpfile}2"
-
-
-#####################
-# Generate xml file #
-#####################
-
-outputFilePath="domains.xml"
-
-if test $# -ne 0
-then
-    # Output file is the input file with the xml extension
-    outputFilePath="${1%.*}.xml"
-    if test "$outputFilePath" == "$1"
-    then
-        # There is a conflict
-        outputFilePath="${1}.xml"
-    fi
-fi
-
-log "Output file: $outputFilePath"
-
-parameter_execute_if_exist () {
-    $parameter help | grep --quiet --word $1 || return $?
-    $parameter $1 | sed 's/\r//'
-}
-
-parameter_execute_if_exist getDomainsWithSettingsXML > "$outputFilePath" ||
-    # Fall back on old command
-    parameter_execute_if_exist getDomainsXML > "$outputFilePath"
-
-
-log "The media server PFW domains have been change, please restart it to restore old domains"
diff --git a/tools/xmlGenerator/updateRoutageDomains.sh b/tools/xmlGenerator/updateRoutageDomains.sh
deleted file mode 100755
index 69d57b520..000000000
--- a/tools/xmlGenerator/updateRoutageDomains.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011-2014, Intel Corporation
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation and/or
-# other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# It creates XML settings from a .pfw description
-# It Also instanciate a PFW with them loaded
-
-# The generated pfw commands
-scriptPFWFile="/tmp/scriptPFW"
-
-# A tmp file, the pfw must have write priviledge on it
-ExportTmpFile="/data/routageDomains.xml"
-
-set -e -u -o pipefail
-
-
-if test $# -eq 0
-then
-        DomainFile="${PFWtest_DomainFile}"
-else
-        DomainFile="$@"
-fi
-
-function echoColor ()
-{
-    if test -t 1  ;
-    then
-        # stdout is a tty => colors
-        /bin/echo -e "\033[32m$@\033[0m"
-    else
-        # stdout is not a tty => no color
-        /bin/echo -e "$@"
-    fi
-}
-
-
-function androidWithError ()
-{
-    echo "    \$ $PFWtest_prefixCommand $@"
-    local result
-
-    result=$( $PFWtest_prefixCommand "$*"' ; echo $?' | sed -e 's#[\r]##' );
-
-    echo "$(echo "$result" | sed '$d')" ;
-
-    return "$(echo "$result" | tail -n1 )";
-}
-
-echoColor "Translate domains to pfw commands"
-echoColor "Domains source file: $DomainFile"
-m4 "$DomainFile" | $(dirname $0)/PFWScriptGenerator.py --output-kind pfw  -o "$scriptPFWFile"
-
-echoColor "List of generated domains :"
-sed -ne 's/createDomain \(.*\)/    \1/p'  "$scriptPFWFile"
-
-echoColor "Make fs writable"
-adb remount
-
-echoColor "instanciate pseudo hal"
-$PFWtest_test_scripts/instanciatePseudoHal.sh "$PFWtest_ParameterFrameworkConfigurationFile" "$PFWtest_CriterionFile"
-
-echoColor "Create Domains"
-$(dirname $0)/domainGenerator.sh "$scriptPFWFile" --keep-autoSync-disable
-
-echoColor "Export domains and settings"
-androidWithError remote-process $PFWtest_ParameterFramworkHost exportDomainsWithSettingsXML "$ExportTmpFile"
-androidWithError cp "$ExportTmpFile" "$PFWtest_RemoteOutputFile"
-
-echoColor "restart PseudoHal"
-$PFWtest_test_scripts/instanciatePseudoHal.sh "$PFWtest_ParameterFrameworkConfigurationFile" "$PFWtest_CriterionFile"
-
-echoColor "Synchronization with local file : $PFWtest_LocalOutputFile"
-adb pull "$PFWtest_RemoteOutputFile" "$PFWtest_LocalOutputFile"
-
-