diff --git a/fix-audio-build.patch b/fix-audio-build.patch
deleted file mode 100644
index 7491cbb..0000000
--- a/fix-audio-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0cc8f8d2a24526bd5baafb2fd89a991ad0218b7b Mon Sep 17 00:00:00 2001
-From: nyyu <mail@nyyu.dev>
-Date: Sun, 25 Sep 2022 14:52:01 +0200
-Subject: [PATCH] audio: fix build
-
-Change-Id: I6d76b39be5cb0e6fee9d0154f2d84b61e386fe32
----
- visualizer/offload_visualizer.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
-index 0166ac2..f38bed9 100644
---- a/visualizer/offload_visualizer.c
-+++ b/visualizer/offload_visualizer.c
-@@ -38,7 +38,13 @@ enum {
- };
- 
- typedef struct effect_context_s effect_context_t;
--typedef struct output_context_s output_context_t;
-+
-+typedef struct output_context_s {
-+    struct listnode outputs_list_node;  /* node in active_outputs_list */
-+    audio_io_handle_t handle; /* io handle */
-+    struct listnode effects_list; /* list of effects attached to this output */
-+} output_context_t;
-+
- 
- /* effect specific operations. Only the init() and process() operations must be defined.
-  * Others are optional.
-@@ -72,12 +78,6 @@ struct effect_context_s {
-     effect_ops_t ops;
- };
- 
--typedef struct output_context_s {
--    struct listnode outputs_list_node;  /* node in active_outputs_list */
--    audio_io_handle_t handle; /* io handle */
--    struct listnode effects_list; /* list of effects attached to this output */
--} output_context_t;
--
- 
- /* maximum time since last capture buffer update before resetting capture buffer. This means
-   that the framework has stopped playing audio and we must start returning silence */
--- 
-2.37.3
-
diff --git a/fix-qcwcn-build.patch b/fix-qcwcn-build.patch
deleted file mode 100644
index a035653..0000000
--- a/fix-qcwcn-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 796a67b903fb4a1dc47de4aa981af4bc2f88df65 Mon Sep 17 00:00:00 2001
-From: nyyu <mail@nyyu.dev>
-Date: Sat, 24 Sep 2022 12:41:39 +0200
-Subject: [PATCH] qcwcn: fix build error format msg
-
-Change-Id: Ie99ff98324d2aefde585c7d3d8b603c6e725e78f
----
- qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c
-index 9656710..e89a741 100644
---- a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c
-+++ b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c
-@@ -2739,7 +2739,7 @@ void print_setup_cmd_values(struct twt_setup_parameters *twt_setup_params)
- 		   twt_setup_params->min_wake_duration);
- 	wpa_printf(MSG_DEBUG, "TWT: max wake duration: %d ",
- 		   twt_setup_params->max_wake_duration);
--	wpa_printf(MSG_DEBUG, "TWT: wake tsf: 0x%lx ",
-+	wpa_printf(MSG_DEBUG, "TWT: wake tsf: 0x%llx ",
- 		   twt_setup_params->wake_tsf);
- 	wpa_printf(MSG_DEBUG, "TWT: announce timeout(in us): %u",
- 		   twt_setup_params->announce_timeout_us);
diff --git a/sync.sh b/sync.sh
index ad7f068..30aedc6 100644
--- a/sync.sh
+++ b/sync.sh
@@ -44,17 +44,6 @@ cd packages/apps/Trebuchet
 git am $DRONE_WORKSPACE_BASE/fix-enable-more-grids-for-tablet.patch || git am --abort
 cd $TOPDIR
 
-#qcom wlan
-repopick -f 336676 336677 336678 336679 336680
-cd hardware/qcom-caf/wlan
-git am $DRONE_WORKSPACE_BASE/fix-qcwcn-build.patch || git am --abort
-cd $TOPDIR
-
-#qcom caf audio
-cd hardware/qcom-caf/msm8974/audio
-git am $DRONE_WORKSPACE_BASE/fix-audio-build.patch || git am --abort
-cd $TOPDIR
-
 #bluetooth
 cd packages/modules/Bluetooth
 git am $DRONE_WORKSPACE_BASE/fix-bt-1.patch || git am --abort