diff --git a/BoardConfig.mk b/BoardConfig.mk
index 04a7318..76bcbbd 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,12 +22,6 @@ TARGET_NO_BOOTLOADER := true
 # Display
 TARGET_SCREEN_DENSITY := 240
 
-# Graphics
-BOARD_MESA3D_BUILD_LIBGBM := true
-BOARD_MESA3D_USES_MESON_BUILD := true
-BOARD_MESA3D_GALLIUM_DRIVERS := vc4 v3d
-BOARD_MESA3D_VULKAN_DRIVERS := broadcom
-
 # Kernel
 BOARD_CUSTOM_BOOTIMG := true
 BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk
diff --git a/device.mk b/device.mk
index 6f033ad..54c27d9 100644
--- a/device.mk
+++ b/device.mk
@@ -118,8 +118,7 @@ PRODUCT_PACKAGES += \
 # Graphics
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator-service.minigbm_gbm_mesa \
-    mapper.minigbm_gbm_mesa \
-    libgbm_mesa_wrapper
+    mapper.minigbm_gbm_mesa
 
 PRODUCT_PACKAGES += \
     com.android.hardware.graphics.composer.drm_hwcomposer