diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 0e049c65..f0c14f9c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -398,7 +398,6 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
 include device/google/gs101-sepolicy/gs101-sepolicy.mk
--include device/google/gs101/soong/pixel_soong_config.mk
 
 # Battery options
 BOARD_KERNEL_CMDLINE += at24.write_timeout=100
diff --git a/device.mk b/device.mk
index 948f2ae4..f79665b7 100644
--- a/device.mk
+++ b/device.mk
@@ -335,8 +335,6 @@ endif
 PRODUCT_PACKAGES += \
 	android.hardware.usb@1.3-service.gs101
 
-OLDER_GADGET := false
-
 # MIDI feature
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
diff --git a/soong/Android.bp b/soong/Android.bp
deleted file mode 100644
index 8894e132..00000000
--- a/soong/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
-    ],
-}
-
-soong_config_module_type {
-  name: "pixel_usbgadget_cc_defaults",
-  module_type: "cc_defaults",
-  config_namespace: "usb",
-  bool_variables: ["older_gadget"],
-  properties: ["cflags"],
-}
-
diff --git a/soong/pixel_soong_config.mk b/soong/pixel_soong_config.mk
deleted file mode 100644
index 519602cf..00000000
--- a/soong/pixel_soong_config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Add pixel common soong config here.
-# Set the variables properly in ProductConfig Makefiles for each pixel device
-
-#For USB
-SOONG_CONFIG_NAMESPACES += usb
-SOONG_CONFIG_usb += older_gadget
-
-SOONG_CONFIG_usb_older_gadget := $(OLDER_GADGET)
diff --git a/usb/Android.bp b/usb/Android.bp
index d6c0c726..ccaa0011 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -24,20 +24,6 @@ package {
     ],
 }
 
-soong_config_module_type_import {
-    from: "device/google/gs101/soong/Android.bp",
-    module_types: ["pixel_usbgadget_cc_defaults"],
-}
-
-pixel_usbgadget_cc_defaults {
-    name: "pixel_usbgadget",
-    soong_config_variables: {
-        older_gadget: {
-            cflags: ["-DOLDER_GADGET"],
-	},
-    },
-}
-
 cc_binary {
     name: "android.hardware.usb@1.3-service.gs101",
     relative_install_path: "hw",
@@ -48,7 +34,6 @@ cc_binary {
     ],
     srcs: ["service.cpp", "Usb.cpp", "UsbGadget.cpp"],
     cflags: ["-Wall", "-Werror"],
-    defaults: ["pixel_usbgadget"],
     shared_libs: [
         "libbase",
         "libhidlbase",
diff --git a/usb/Usb.h b/usb/Usb.h
index 930769c9..69bf1caa 100644
--- a/usb/Usb.h
+++ b/usb/Usb.h
@@ -66,13 +66,8 @@ enum class HALVersion{
     V1_3
 };
 
-#ifdef OLDER_GADGET
 constexpr char kGadgetName[] = "11110000.dwc3";
 #define UDC_PATH "/sys/class/udc/11110000.dwc3/"
-#else
-constexpr char kGadgetName[] = "11110000.usb";
-#define UDC_PATH "/sys/class/udc/11110000.usb/"
-#endif
 
 #define ID_PATH UDC_PATH "device/id"
 #define VBUS_PATH UDC_PATH "device/b_sess"
diff --git a/usb/UsbGadget.h b/usb/UsbGadget.h
index 3cb3170e..2669f8da 100644
--- a/usb/UsbGadget.h
+++ b/usb/UsbGadget.h
@@ -70,12 +70,9 @@ using ::android::hardware::usb::gadget::V1_2::IUsbGadget;
 using ::android::hardware::usb::gadget::V1_2::GadgetFunction;
 using ::std::string;
 
-#ifdef OLDER_GADGET
 constexpr char kGadgetName[] = "11110000.dwc3";
+#ifndef UDC_PATH
 #define UDC_PATH "/sys/class/udc/11110000.dwc3/"
-#else
-constexpr char kGadgetName[] = "11110000.usb";
-#define UDC_PATH "/sys/class/udc/11110000.usb/"
 #endif
 static MonitorFfs monitorFfs(kGadgetName);