diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.7 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.7
deleted file mode 100644
index 9657aee84..000000000
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.7
+++ /dev/null
@@ -1,5 +0,0 @@
-ccflags-y += -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-4.8 b/qla2x00t/qla2x00-target/Makefile_in-tree-4.8
deleted file mode 100644
index 9657aee84..000000000
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-4.8
+++ /dev/null
@@ -1,5 +0,0 @@
-ccflags-y += -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.7.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.7.patch
deleted file mode 100644
index 3f3372ca3..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index e1e2066cecdb..e7dd3af2a865 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -28,6 +28,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.8.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.8.patch
deleted file mode 100644
index 3f3372ca3..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index e1e2066cecdb..e7dd3af2a865 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -28,6 +28,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.7 b/scst/kernel/in-tree/Makefile.dev_handlers-4.7
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-4.8 b/scst/kernel/in-tree/Makefile.dev_handlers-4.8
deleted file mode 100644
index f933b36f7..000000000
--- a/scst/kernel/in-tree/Makefile.dev_handlers-4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
-	scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
-
-obj-$(CONFIG_SCST_DISK)		+= scst_disk.o
-obj-$(CONFIG_SCST_TAPE)		+= scst_tape.o
-obj-$(CONFIG_SCST_CDROM)	+= scst_cdrom.o
-obj-$(CONFIG_SCST_MODISK)	+= scst_modisk.o
-obj-$(CONFIG_SCST_CHANGER)	+= scst_changer.o
-obj-$(CONFIG_SCST_RAID)		+= scst_raid.o
-obj-$(CONFIG_SCST_PROCESSOR)	+= scst_processor.o
-obj-$(CONFIG_SCST_VDISK)	+= scst_vdisk.o
-obj-$(CONFIG_SCST_USER)		+= scst_user.o
diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.7.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.7.patch
deleted file mode 100644
index e5e8be8b2..000000000
--- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 0b6f3d60193d..d4336cf8818d 100644
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -140,6 +140,7 @@ obj-$(CONFIG_SSB)		+= ssb/
- obj-$(CONFIG_BCMA)		+= bcma/
- obj-$(CONFIG_VHOST_RING)	+= vhost/
- obj-$(CONFIG_VLYNQ)		+= vlynq/
-+obj-$(CONFIG_SCST)		+= scst/
- obj-$(CONFIG_STAGING)		+= staging/
- obj-y				+= platform/
- #common clk code
diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-4.8.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-4.8.patch
deleted file mode 100644
index 8c1bb91ca..000000000
--- a/scst/kernel/in-tree/Makefile.drivers.Linux-4.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 53abb4a5f736..5da5086b2d07 100644
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -140,6 +140,7 @@ obj-$(CONFIG_BCMA)		+= bcma/
- obj-$(CONFIG_VHOST_RING)	+= vhost/
- obj-$(CONFIG_VHOST)		+= vhost/
- obj-$(CONFIG_VLYNQ)		+= vlynq/
-+obj-$(CONFIG_SCST)		+= scst/
- obj-$(CONFIG_STAGING)		+= staging/
- obj-y				+= platform/
- #common clk code
diff --git a/scst/kernel/in-tree/Makefile.scst-4.7 b/scst/kernel/in-tree/Makefile.scst-4.7
deleted file mode 100644
index f4e0cc985..000000000
--- a/scst/kernel/in-tree/Makefile.scst-4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-scst-y        += scst_copy_mgr.o
-scst-y        += scst_debug.o
-scst-y        += scst_dlm.o
-scst-y        += scst_event.o
-scst-y        += scst_lib.o
-scst-y        += scst_main.o
-scst-y        += scst_mem.o
-scst-y        += scst_no_dlm.o
-scst-y        += scst_pres.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_targ.o
-scst-y        += scst_tg.o
-
-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
-			srpt/ scst_local/
diff --git a/scst/kernel/in-tree/Makefile.scst-4.8 b/scst/kernel/in-tree/Makefile.scst-4.8
deleted file mode 100644
index f4e0cc985..000000000
--- a/scst/kernel/in-tree/Makefile.scst-4.8
+++ /dev/null
@@ -1,17 +0,0 @@
-ccflags-y += -Wno-unused-parameter
-
-scst-y        += scst_copy_mgr.o
-scst-y        += scst_debug.o
-scst-y        += scst_dlm.o
-scst-y        += scst_event.o
-scst-y        += scst_lib.o
-scst-y        += scst_main.o
-scst-y        += scst_mem.o
-scst-y        += scst_no_dlm.o
-scst-y        += scst_pres.o
-scst-y        += scst_sysfs.o
-scst-y        += scst_targ.o
-scst-y        += scst_tg.o
-
-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
-			srpt/ scst_local/
diff --git a/scst_local/in-tree/Makefile-4.7 b/scst_local/in-tree/Makefile-4.7
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.7
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.8 b/scst_local/in-tree/Makefile-4.8
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.8
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-