diff --git a/module/common/temp/uninstall.sh b/module/common/temp/uninstall.sh
deleted file mode 100644
index 35fab9a..0000000
--- a/module/common/temp/uninstall.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-MODPATH=${0%/*}
-TS="/data/adb/modules/tricky_store"
-SCRIPT_DIR="/data/adb/tricky_store"
-
-# Enable back TSupport-A auto update
-if [ -f "/storage/emulated/0/stop-tspa-auto-target" ]; then
-    rm -f "/storage/emulated/0/stop-tspa-auto-target"
-fi
-
-# Remove residue and restore aosp keybox.
-rm -rf "/data/adb/modules/.TA_utl"
-rm -f "/data/adb/boot_hash"
-if [ -d "$TS" ]; then
-    if [ -f "$TS/action.sh" ]; then
-        rm -f "$TS/action.sh"
-    else
-        rm -rf "$TS/webroot"
-    fi
-fi
-xxd -r -p "$MODPATH/.default" | base64 -d > "$SCRIPT_DIR/keybox.xml"
diff --git a/module/install_func.sh b/module/install_func.sh
index ea8dd27..48f65d7 100644
--- a/module/install_func.sh
+++ b/module/install_func.sh
@@ -7,7 +7,8 @@ initialize() {
     fi
     
     cp "$MODPATH/module.prop" "$COMPATH/temp/module.prop"
-    cp "$COMPATH/.default" "$COMPATH/temp/.default"
+    cp "$COMPATH/.default" "$COMPATH/temp/common/.default"
+    cp "$MODPATH/uninstall.sh" "$COMPATH/temp/uninstall.sh"
     set_perm $COMPATH/get_extra.sh 0 2000 0755
     set_perm $COMPATH/get_WebUI.sh 0 2000 0755
     
diff --git a/module/post-fs-data.sh b/module/post-fs-data.sh
new file mode 100644
index 0000000..85f17ed
--- /dev/null
+++ b/module/post-fs-data.sh
@@ -0,0 +1,17 @@
+MODPATH=${0%/*}
+TS="/data/adb/modules/tricky_store"
+
+while [ -z "$(ls -A /data/adb/modules/)" ]; do
+    sleep 1
+done
+
+if [ ! -d "$TS" ] || [ -f "$TS/remove" ]; then
+    if [ -d "$MODPATH/common/temp" ]; then
+        mkdir -p "/data/adb/modules/TA_utl"
+        cp -rf "$MODPATH/common/temp"/* "/data/adb/modules/TA_utl/"
+        touch "/data/adb/modules/TA_utl/remove"
+    else
+        touch "$MODPATH/remove"
+    fi
+    exit 1
+fi
\ No newline at end of file
diff --git a/module/service.sh b/module/service.sh
index 180524d..b5732c0 100644
--- a/module/service.sh
+++ b/module/service.sh
@@ -34,47 +34,35 @@ fi
 OUTPUT_APP="$MODPATH/common/applist"
 OUTPUT_SKIP="$MODPATH/common/skiplist"
 
-if [ ! -d "$TS" ]; then
-    if [ -d "$MODPATH/common/temp" ]; then
-        mkdir -p "/data/adb/modules/TA_utl"
-        cp -rf "$MODPATH/common/temp/*" "/data/adb/modules/TA_utl/"
-        touch "/data/adb/modules/TA_utl/remove"
-        exit 1
-    else
-        touch "$MODPATH/remove"
-        exit 1
+if [ -f "$MODPATH/action.sh" ]; then
+    if [ -f "$TS/action.sh" ]; then
+        rm -f "$TS/action.sh"
     fi
-elif  [ -f "$TS/disable" ]; then
-    exit 1
+    ln -s "$MODPATH/action.sh" "$TS/action.sh"
 else
-    if [ -f "$MODPATH/action.sh" ]; then
-        if [ -f "$TS/action.sh" ]; then
-            rm -f "$TS/action.sh"
-        fi
-        ln -s "$MODPATH/action.sh" "$TS/action.sh"
-    else
-        if [ -d "$TS/webroot" ]; then
-            rm -rf "$TS/webroot"
-        fi
-        if [ -d "$MODPATH/common/temp" ]; then
-            ln -s "$MODPATH/webroot" "$TS/webroot"
-        fi
+    if [ -d "$TS/webroot" ]; then
+        rm -rf "$TS/webroot"
+    fi
+    if [ -d "$MODPATH/common/temp" ]; then
+        ln -s "$MODPATH/webroot" "$TS/webroot"
     fi
-    until [ "$(getprop sys.boot_completed)" = "1" ]; do
-        sleep 1
-    done
-    echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_APP"
-    echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_SKIP"
-    pm list packages -3 </dev/null 2>&1 | cat | awk -F: '{print $2}' | while read -r PACKAGE; do
-        APK_PATH=$(pm path "$PACKAGE" </dev/null 2>&1 | cat | grep "base.apk" | awk -F: '{print $2}' | tr -d '\r')
-        if [ -n "$APK_PATH" ]; then
-            APP_NAME=$(aapt dump badging "$APK_PATH" </dev/null 2>&1 | cat | grep "application-label:" | sed "s/application-label://g; s/'//g")
-            echo "app-name: $APP_NAME, package-name: $PACKAGE" >> "$OUTPUT_APP"
-        else
-            echo "app-name: Unknown App package-name: $PACKAGE" >> "$OUTPUT_APP"
-        fi
-        if ! aapt dump xmltree "$APK_PATH" AndroidManifest.xml </dev/null 2>&1 | cat | grep -qE "xposed.category|xposeddescription"; then
-            echo "$PACKAGE" >> "$OUTPUT_SKIP"
-        fi
-    done
 fi
+
+until [ "$(getprop sys.boot_completed)" = "1" ]; do
+    sleep 1
+done
+
+echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_APP"
+echo "# This file is generated from service.sh to speed up load time" > "$OUTPUT_SKIP"
+pm list packages -3 </dev/null 2>&1 | cat | awk -F: '{print $2}' | while read -r PACKAGE; do
+    APK_PATH=$(pm path "$PACKAGE" </dev/null 2>&1 | cat | grep "base.apk" | awk -F: '{print $2}' | tr -d '\r')
+    if [ -n "$APK_PATH" ]; then
+        APP_NAME=$(aapt dump badging "$APK_PATH" </dev/null 2>&1 | cat | grep "application-label:" | sed "s/application-label://g; s/'//g")
+        echo "app-name: $APP_NAME, package-name: $PACKAGE" >> "$OUTPUT_APP"
+    else
+        echo "app-name: Unknown App package-name: $PACKAGE" >> "$OUTPUT_APP"
+    fi
+    if ! aapt dump xmltree "$APK_PATH" AndroidManifest.xml </dev/null 2>&1 | cat | grep -qE "xposed.category|xposeddescription"; then
+        echo "$PACKAGE" >> "$OUTPUT_SKIP"
+    fi
+done
diff --git a/module/uninstall.sh b/module/uninstall.sh
index 3333ff2..620cdea 100644
--- a/module/uninstall.sh
+++ b/module/uninstall.sh
@@ -8,6 +8,7 @@ if [ -f "/storage/emulated/0/stop-tspa-auto-target" ]; then
 fi
 
 # Remove residue and restore aosp keybox.
+rm -rf "/data/adb/modules/.TA_utl"
 rm -f "/data/adb/boot_hash"
 if [ -d "$TS" ]; then
     if [ -f "$TS/action.sh" ]; then