diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index b437fad..2c998a6 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -281,15 +281,8 @@ write_locale_conf(){
     fi
 }
 
-check_gis(){
-    has_gis='false'
-    msg2 "Check for GIS"
-    [[ -e "${work_dir}/desktopfs/usr/lib/gnome-initial-setup" ]] && has_gis='true'
-}
-
 write_settings_conf(){
     local conf="$1/etc/calamares/settings.conf"
-    check_gis
     msg2 "Writing %s ..." "${conf##*/}"
     echo "---" > "$conf"
     echo "modules-search: [ local ]" >> "$conf"
@@ -297,14 +290,14 @@ write_settings_conf(){
     echo "sequence:" >> "$conf"
     echo "    - show:" >> "$conf"
     echo "        - welcome" >> "$conf" && write_welcome_conf
-    if ${oem_used} || ${has_gis}; then
+    if ${oem_used}; then
         msg2 "Skipping to show locale and keyboard modules."
     else
         echo "        - locale" >> "$conf" && write_locale_conf
         echo "        - keyboard" >> "$conf"
     fi
     echo "        - partition" >> "$conf"
-    if ${oem_used} || ${has_gis}; then
+    if ${oem_used}; then
         msg2 "Skipping to show users module."
     else
         echo "        - users" >> "$conf" && write_users_conf
@@ -340,7 +333,7 @@ write_settings_conf(){
     fi
     echo "        - machineid" >> "$conf" && write_machineid_conf
     echo "        - fstab" >> "$conf"
-    if ${oem_used}|| ${has_gis}; then
+    if ${oem_used}; then
         msg2 "Skipping to set locale, keyboard and localecfg modules."
     else
         echo "        - locale" >> "$conf"
@@ -354,8 +347,6 @@ write_settings_conf(){
     if ${oem_used}; then
         msg2 "Skipping to set users module."
         echo "        - oemuser" >> "$conf"
-    elif ${has_gis}; then
-        msg2 "Skipping to set users module."
     else
         echo "        - users" >> "$conf"
     fi