diff --git a/device.mk b/device.mk
index 7c17ece..d599d43 100644
--- a/device.mk
+++ b/device.mk
@@ -215,6 +215,11 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
     frameworks/native/data/etc/android.software.freeform_window_management.xml:system/etc/permissions/android.software.freeform_window_management.xml
 
+# Preopt critical applications
+PRODUCT_DEXPREOPT_SPEED_APPS += \
+    Settings \
+    SystemUI
+
 # Power
 PRODUCT_PACKAGES += \
     android.hardware.power@1.0-service.waydroid
@@ -235,6 +240,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
+# Speed profile services and wifi-service to reduce RAM and storage.Add commentMore actions
+PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile
+PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK := true
+
 # Binder IPC
 PRODUCT_PACKAGES += \
     vndservicemanager
diff --git a/system.prop b/system.prop
index de8cf1d..59fc812 100644
--- a/system.prop
+++ b/system.prop
@@ -5,14 +5,6 @@ import /vendor_extra/build.prop vendor.gralloc.disable_ubwc
 af.thread.throttle=false
 audio.deep_buffer.media=true
 
-# Provides overrides to configure the Dalvik heap for a 4GB phone
-dalvik.vm.heapstartsize=8m
-dalvik.vm.heapgrowthlimit=192m
-dalvik.vm.heapsize=512m
-dalvik.vm.heaptargetutilization=0.6
-dalvik.vm.heapminfree=8m
-dalvik.vm.heapmaxfree=16m
-
 # SurfaceFlinger
 ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 ro.surface_flinger.running_without_sync_framework=true