diff --git a/Makefile b/Makefile
index 7e4f260..771ed28 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,6 @@ LIBS_YAML = \
 	lib/util-yaml.sh
 
 SHARED_YAML = \
-	data/desktop.map \
 	data/linux.preset
 
 SCHEMAS = \
diff --git a/docbook/profile.conf.xml b/docbook/profile.conf.xml
index ae1b523..6b501f1 100644
--- a/docbook/profile.conf.xml
+++ b/docbook/profile.conf.xml
@@ -90,47 +90,6 @@
 				</listitem>
 			</varlistentry>
 
-			<varlistentry>
-				<term><varname>default_desktop_executable=</varname></term>
-				<term><varname>default_desktop_file=</varname></term>
-
-				<listitem><para>Executable and desktop file used to set witch
-				desktop environment the display manager will run by default.
-				default_desktop_executable= defines a binary in /usr/bin and
-				default_desktop_file a .desktop file in /usr/share/xsessions,
-				skipping the .desktop part.
-				<screen>
-				default_desktop_executable=startxfce4
-				default_desktop_file=xfce
-				</screen>
-				If one or both values are not set or "none" (the default) buildiso
-				will try to autodetect the desktop environment.
-				</para>
-				<para>
-				Incomplete list of possible values:
-				</para>
-				<screen>
-				Desktop         Desktop executable      Desktop file
-				--------------------------------------------------------
-				Budgie          budgie-session          budgie-session
-				Cinnamon        cinnamon-session        cinnamon-session
-				Enlightenment   enlightenment_start     enlightenment
-				Gnome           gnome-session           gnome
-				i3              i3                      i3
-				KDE Plasma 4    startkde                kde-plasma
-				KDE Plasma 5    startkde                plasma
-				LXDE            lxsession               LXDE
-				LXDE            startlxde               LXDE
-				LXQt            lxqt-session            lxqt
-				Mate            mate-session            mate
-				Openbox         openbox-session         openbox
-				Pantheon        pantheon-session        pantheon
-				PekWM           pekwm                   pekwm
-				Xfce            startxfce4              xfce
-				</screen>
-				</listitem>
-			</varlistentry>
-
 			<varlistentry>
 				<term><varname>netinstall=</varname></term>
 
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 475a08b..c286d9e 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -165,12 +165,6 @@ write_live_session_conf(){
     echo '# iso name' >> ${conf}
     echo "iso_name=${iso_name}" >> ${conf}
     echo '' >> ${conf}
-    echo '# default_desktop_file' >> ${conf}
-    echo "default_desktop_file=${default_desktop_file}" >> ${conf}
-    echo '' >> ${conf}
-    echo '# default_desktop_executable' >> ${conf}
-    echo "default_desktop_executable=${default_desktop_executable}" >> ${conf}
-    echo '' >> ${conf}
     echo '# samba workgroup' >> ${conf}
     echo "smb_workgroup=${smb_workgroup}" >> ${conf}
 }
@@ -203,7 +197,6 @@ configure_system(){
 
 configure_live_image(){
     msg "Configuring [live-image]"
-    detect_desktop_env "$1"
     configure_hosts "$1"
     configure_lsb "$1"
     configure_mhwd "$1"
diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 73a42e8..e2e515e 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -9,38 +9,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-load_desktop_map(){
-    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
-        file=${DATADIR}/desktop.map
-    local desktop_map=$(sed "$_com_rm" "$file" \
-            | sed "$_space" \
-            | sed "$_clean")
-    echo ${desktop_map}
-}
-
-detect_desktop_env(){
-    local xs=$1/usr/share/xsessions ex=$1/usr/bin key val map=( $(load_desktop_map) )
-    default_desktop_file="none"
-    default_desktop_executable="none"
-    for item in "${map[@]}";do
-        key=${item%:*}
-        val=${item#*:}
-        if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
-            default_desktop_file="$key"
-            default_desktop_executable="$val"
-        fi
-    done
-}
-
-is_valid_de(){
-    if [[ ${default_desktop_executable} != "none" ]] && \
-    [[ ${default_desktop_file} != "none" ]]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
 write_machineid_conf(){
     local conf="${modules_dir}/machineid.conf" switch='false'
     msg2 "Writing %s ..." "${conf##*/}"
@@ -141,24 +109,13 @@ write_displaymanager_conf(){
     local conf="${modules_dir}/displaymanager.conf"
     msg2 "Writing %s ..." "${conf##*/}"
     echo "---" > "$conf"
-    if ${chrootcfg}; then
-        echo "displaymanagers:" >> "$conf"
-        echo "  - lightdm" >> "$conf"
-        echo "  - gdm" >> "$conf"
-        echo "  - mdm" >> "$conf"
-        echo "  - sddm" >> "$conf"
-        echo "  - lxdm" >> "$conf"
-        echo "  - slim" >> "$conf"
-    else
-        echo "displaymanagers:" >> "$conf"
-        echo "  - ${displaymanager}" >> "$conf"
-        echo '' >> "$conf"
-        if $(is_valid_de); then
-            echo "defaultDesktopEnvironment:" >> "$conf"
-            echo "    executable: \"${default_desktop_executable}\"" >> "$conf"
-            echo "    desktopFile: \"${default_desktop_file}\"" >> "$conf"
-        fi
-    fi
+    echo "displaymanagers:" >> "$conf"
+    echo "  - lightdm" >> "$conf"
+    echo "  - gdm" >> "$conf"
+    echo "  - mdm" >> "$conf"
+    echo "  - sddm" >> "$conf"
+    echo "  - lxdm" >> "$conf"
+    echo "  - slim" >> "$conf"
     echo '' >> "$conf"
     echo "basicSetup: false" >> "$conf"
 }
@@ -394,7 +351,7 @@ configure_calamares(){
     modules_dir=$1/etc/calamares/modules
 
     mkdir -p ${modules_dir}
-
+        
     write_settings_conf "$1"
 
     write_locale_conf