diff --git a/gordon_peak/BoardConfig.mk b/gordon_peak/BoardConfig.mk
index 25dd424..d00da82 100644
--- a/gordon_peak/BoardConfig.mk
+++ b/gordon_peak/BoardConfig.mk
@@ -44,7 +44,7 @@ KERNEL_LOGLEVEL ?= 2
 endif

 BOARD_KERNEL_CMDLINE += \
-        loglevel=$(KERNEL_LOGLEVEL) \
+	ignore_loglevel \
         androidboot.hardware=$(TARGET_DEVICE)\
         firmware_class.path=/vendor/firmware

@@ -240,8 +240,14 @@ UFO_ENABLE_GEN := gen9
 TARGET_USE_PRIVATE_LIBDRM := true
 LIBDRM_VER ?= bxt

-# Force atomic modesetting on gen9 and above
-BOARD_KERNEL_CMDLINE += drm.atomic=1 i915.nuclear_pageflip=1 i915.enable_rc6=1
+# atomic no longer exists, nuclear_pageflip is enabled by default in GEN5+
+#BOARD_KERNEL_CMDLINE += drm.atomic=1 i915.nuclear_pageflip=1 i915.enable_rc6=1
+BOARD_KERNEL_CMDLINE += i915.enable_rc6=1 drm.debug=0xe
+
+# MT: disable audio
+BOARD_USES_GENERIC_AUDIO := true
+# - disable audio
+
 ##############################################################
 # Source: device/intel/mixins/groups/graphics/ufo_gen9/BoardConfig.mk
 ##############################################################
@@ -322,7 +328,7 @@ BOARD_SEPOLICY_DIRS += device/intel/sepolicy/rfkill
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/marvellW8897/BoardConfig.mk
 ##############################################################
-BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH := false
 BOARD_HAVE_BLUETOOTH_LINUX_PRI := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR = $(TARGET_DEVICE_DIR)
 DEVICE_PACKAGE_OVERLAYS += \
@@ -491,8 +497,8 @@ BOARD_SEPOLICY_DIRS += device/intel/sepolicy/gptp
 BOARD_SEPOLICY_DIRS += device/intel/sepolicy/ufipc

 # for AVB Streamhandler daemon
-BOARD_SEPOLICY_M4DEFS += module_gptp=true
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/avbstreamhandler
+#BOARD_SEPOLICY_M4DEFS += module_gptp=true
+#BOARD_SEPOLICY_DIRS += device/intel/sepolicy/avbstreamhandler

 # SmartX module Properties
 smxelements := CFG SMX EVT RZN AHD MDL SXC SHM SMW RB DP DBG TST SMJ
diff --git a/gordon_peak/init.rc b/gordon_peak/init.rc
index d8b6384..daee0e6 100644
--- a/gordon_peak/init.rc
+++ b/gordon_peak/init.rc
@@ -336,6 +336,7 @@ on boot

 on property:bluetooth.hwcfg=start
     start btcfg
+    disabled

 service btcfg /system/bin/btcfg.sh
     user bluetooth
@@ -595,6 +596,7 @@ service storageproxyd /system/vendor/bin/intelstorageproxyd -d /dev/trusty-ipc-d
     class late_start
     user system
     group system
+    disabled
 ##############################################################
 # Source: device/intel/mixins/groups/security/cse/init.rc
 ##############################################################