diff --git a/BoardConfig.mk b/BoardConfig.mk
index 121cdcc..a678859 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -158,12 +158,6 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/configs/vendor_fram
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/manifest.xml
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/compatibility_matrix.xml
 
-# LineageHW
-BOARD_HARDWARE_CLASS += hardware/lineage/lineagehw
-
-# Lineage Hardware
-JAVA_SOURCE_OVERLAYS := org.lineageos.hardware|$(DEVICE_PATH)/lineagehw|**/*.java
-
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 79691776
 BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200
diff --git a/include/samsung_lights.h b/include/samsung_lights.h
index 0b0ff3f..029be32 100644
--- a/include/samsung_lights.h
+++ b/include/samsung_lights.h
@@ -29,10 +29,6 @@
 #define PANEL_MAX_BRIGHTNESS_NODE "/sys/class/leds/lcd-backlight/max_brightness"
 #define BUTTON_BRIGHTNESS_NODE "/sys/class/sec/sec_touchkey/brightness"
 #define LED_BLINK_NODE "/sys/class/sec/led/led_blink"
-#define LED_BLN_NODE "/sys/class/misc/backlightnotification/notification_led"
-
-// Uncomment to enable variable button brightness
-//#define VAR_BUTTON_BRIGHTNESS 1
 
 /*
  * Brightness adjustment factors
diff --git a/lineagehw/src/org/lineageos/hardware/KeyDisabler.java b/lineagehw/src/org/lineageos/hardware/KeyDisabler.java
deleted file mode 100644
index f9555cc..0000000
--- a/lineagehw/src/org/lineageos/hardware/KeyDisabler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2014 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.lineageos.hardware;
-
-import org.lineageos.internal.util.FileUtils;
-
-/*
- * Disable capacitive keys
- *
- * This is intended for use on devices in which the capacitive keys
- * can be fully disabled for replacement with a soft navbar. You
- * really should not be using this on a device with mechanical or
- * otherwise visible-when-inactive keys
- */
-
-public class KeyDisabler {
-
-    private static String CONTROL_PATH = "/sys/class/sec/sec_touchkey/input/enabled";
-
-    public static boolean isSupported() {
-        return FileUtils.isFileWritable(CONTROL_PATH);
-    }
-
-    public static boolean isActive() {
-        return FileUtils.readOneLine(CONTROL_PATH).equals("0");
-    }
-
-    public static boolean setActive(boolean state) {
-        return FileUtils.writeLine(CONTROL_PATH, (state ? "0" : "1"));
-    }
-
-}
\ No newline at end of file
diff --git a/lineagehw/src/org/lineageos/hardware/VibratorHW.java b/lineagehw/src/org/lineageos/hardware/VibratorHW.java
deleted file mode 100644
index bf59bc0..0000000
--- a/lineagehw/src/org/lineageos/hardware/VibratorHW.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.lineageos.hardware;
-
-import org.lineageos.internal.util.FileUtils;
-
-public class VibratorHW {
-
-    private static String LEVEL_PATH = "/sys/class/timed_output/vibrator/intensity";
-
-    public static boolean isSupported() {
-        return FileUtils.isFileReadable(LEVEL_PATH) && FileUtils.isFileWritable(LEVEL_PATH);
-    }
-
-    public static int getMaxIntensity()  {
-        return 10000;
-    }
-
-    public static int getMinIntensity()  {
-        return 0;
-    }
-
-    public static int getWarningThreshold()  {
-        return 9000;
-    }
-
-    public static int getCurIntensity()  {
-        String actualIntensity = FileUtils.readOneLine(LEVEL_PATH).replace("intensity: ", "");
-        return Integer.parseInt(actualIntensity);
-    }
-
-    public static int getDefaultIntensity()  {
-        return 7500;
-    }
-
-    public static boolean setIntensity(int intensity)  {
-        return FileUtils.writeLine(LEVEL_PATH, String.valueOf(intensity));
-    }
-}
\ No newline at end of file
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
deleted file mode 100644
index 7f612f2..0000000
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Show enabled lte option for lte device -->
-    <bool name="config_enabled_lte" translatable="false">true</bool>
-
-</resources>