diff --git a/hikey-common.mk b/hikey-common.mk
index d4b8797..77ea15b 100644
--- a/hikey-common.mk
+++ b/hikey-common.mk
@@ -1,4 +1,3 @@
-
 ifndef TARGET_KERNEL_USE
 TARGET_KERNEL_USE=4.14
 endif
@@ -11,18 +10,13 @@
 
 PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
 
-ifeq ($(TARGET_KERNEL_USE), 3.18)
-  TARGET_FSTAB := fstab.hikey-$(TARGET_KERNEL_USE)
+ifeq ($(TARGET_KERNEL_USE), 4.4)
   HIKEY_USE_LEGACY_TI_BLUETOOTH := true
 else
-  ifeq ($(TARGET_KERNEL_USE), 4.4)
-    HIKEY_USE_LEGACY_TI_BLUETOOTH := true
-  else
-    HIKEY_USE_LEGACY_TI_BLUETOOTH := false
-    HIKEY_USE_DRM_HWCOMPOSER := true
-  endif
-  TARGET_FSTAB := fstab.hikey
+  HIKEY_USE_LEGACY_TI_BLUETOOTH := false
+  HIKEY_USE_DRM_HWCOMPOSER := true
 endif
+TARGET_FSTAB := fstab.hikey
 
 $(call inherit-product, device/linaro/hikey/hikey/device-hikey.mk)
 $(call inherit-product, device/linaro/hikey/device-common.mk)
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index 90bbc6c..13eed48 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -6,16 +6,12 @@
 TARGET_CPU_VARIANT := cortex-a53
 TARGET_2ND_CPU_VARIANT := cortex-a53
 
-ifeq ($(TARGET_KERNEL_USE), 3.18)
-BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
-else
 ifeq ($(TARGET_KERNEL_USE), 4.19)
 BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
 else
 # FIQ debugger is deprecated and we'll remoeve this once kernel support in prebuilts are yanked
 BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
 endif
-endif
 
 ifneq ($(TARGET_ANDROID_VERITY),)
 # Enable dtb fstab for treble, with verity and system-as-root
@@ -34,7 +30,7 @@
 endif
 
 ## printk.devkmsg only has meaning for kernel 4.9 and later
-## it would be ignored by kernel 3.18 and kernel 4.4
+## it would be ignored by kernel 4.4
 BOARD_KERNEL_CMDLINE += printk.devkmsg=on
 
 TARGET_NO_DTIMAGE := true
diff --git a/hikey/fstab.hikey-3.18 b/hikey/fstab.hikey-3.18
deleted file mode 100644
index 84fad07..0000000
--- a/hikey/fstab.hikey-3.18
+++ /dev/null
@@ -1,12 +0,0 @@
-# Android fstab file.
-#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-#/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             ext4      ro                                                           wait
-#/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             squashfs  ro                                                           wait
-#/dev/block/platform/f723d000.dwmmc0/by-name/vendor      /vendor             ext4      ro                                                           wait
-/dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               f2fs      discard,noatime,nosuid,nodev                                 wait,check,fileencryption=software,quota
-/dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait,formattable
-/devices/platform/f723e000.dwmmc1/mmc_host/mmc*                   auto               auto      defaults  voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/platform/f72c0000.usb/usb*               auto               auto      defaults  voldmanaged=usbdisk:auto,encryptable=userdata