diff --git a/Android.bp b/Android.bp
index bdef8cd..d184d78 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3916,45 +3916,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libtime_genoff",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libtime_genoff.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libtime_genoff.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libtinyxml2_1",
     owner: "xiaomi",
@@ -7530,6 +7491,32 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libtime_genoff",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libtime_genoff.so",
+            ],
+            shared_libs: [
+                "libcutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libwqe",
     owner: "xiaomi",
@@ -9627,17 +9614,6 @@ android_app_import {
     soc_specific: true,
 }
 
-android_app_import {
-    name: "TimeService",
-    owner: "xiaomi",
-    apk: "proprietary/vendor/app/TimeService/TimeService.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    soc_specific: true,
-}
-
 android_app_import {
     name: "PowerOffAlarm",
     owner: "xiaomi",
@@ -10967,34 +10943,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "time_daemon",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/time_daemon",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libqmi_cci",
-                "libqmi_common_so",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "xtra-daemon",
     owner: "xiaomi",
diff --git a/msm8953-common-vendor.mk b/msm8953-common-vendor.mk
index 8871323..bd76704 100644
--- a/msm8953-common-vendor.mk
+++ b/msm8953-common-vendor.mk
@@ -61,7 +61,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/imsrcsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsrcsd.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/init-qcril-data.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init-qcril-data.rc \
-    vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
     vendor/xiaomi/msm8953-common/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
@@ -192,7 +191,6 @@ PRODUCT_PACKAGES += \
     libsensor_user_cal \
     libsysmon_cdsp_skel \
     libthermalclient \
-    libtime_genoff \
     libtinyxml2_1 \
     libwms \
     libwvdrmengine \
@@ -296,6 +294,7 @@ PRODUCT_PACKAGES += \
     libsystem_health_mon \
     libthermalfeature \
     libthermalioctl \
+    libtime_genoff \
     libwqe \
     libwvhidl \
     libxml \
@@ -368,7 +367,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.imsrtpservice@2.1 \
     CneApp \
     IWlanService \
-    TimeService \
     PowerOffAlarm \
     QtiTelephonyService \
     embms \
@@ -423,7 +421,6 @@ PRODUCT_PACKAGES += \
     slim_daemon \
     tftp_server \
     thermal-engine \
-    time_daemon \
     xtra-daemon \
     dpmd
 
diff --git a/proprietary/vendor/app/TimeService/TimeService.apk b/proprietary/vendor/app/TimeService/TimeService.apk
deleted file mode 100644
index 920c63f..0000000
Binary files a/proprietary/vendor/app/TimeService/TimeService.apk and /dev/null differ
diff --git a/proprietary/vendor/bin/time_daemon b/proprietary/vendor/bin/time_daemon
deleted file mode 100644
index 01683f5..0000000
Binary files a/proprietary/vendor/bin/time_daemon and /dev/null differ
diff --git a/proprietary/vendor/etc/init/init.time_daemon.rc b/proprietary/vendor/etc/init/init.time_daemon.rc
deleted file mode 100644
index 7d81585..0000000
--- a/proprietary/vendor/etc/init/init.time_daemon.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-on post-fs-data && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
-    start time_daemon
-
-service time_daemon /vendor/bin/time_daemon
-    class main
-    user system
-    group system
-    capabilities SYS_TIME
diff --git a/proprietary/vendor/lib/libtime_genoff.so b/proprietary/vendor/lib/libtime_genoff.so
deleted file mode 100644
index ac7bdca..0000000
Binary files a/proprietary/vendor/lib/libtime_genoff.so and /dev/null differ