diff --git a/bsp/fishriver/fishriver-preempt-rt.scc b/bsp/fishriver/fishriver-preempt-rt.scc
deleted file mode 100644
index 33b1470157f521e727a66cf7f738ef511e8bdbfb..0000000000000000000000000000000000000000
--- a/bsp/fishriver/fishriver-preempt-rt.scc
+++ /dev/null
@@ -1,14 +0,0 @@
-define KMACHINE fishriver
-define KTYPE preempt-rt
-define KARCH i386
-
-# no new branch required, re-use the ktypes/preempt-rt branch
-include ktypes/preempt-rt
-
-include fishriver.scc
-
-# default policy for preempt-rt kernels
-include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
diff --git a/bsp/fishriver/fishriver-standard.scc b/bsp/fishriver/fishriver-standard.scc
deleted file mode 100644
index 4d7e39e41db0d0c15633ecb1a32830988facd867..0000000000000000000000000000000000000000
--- a/bsp/fishriver/fishriver-standard.scc
+++ /dev/null
@@ -1,17 +0,0 @@
-define KMACHINE fishriver
-define KTYPE standard
-define KARCH i386
-
-include ktypes/standard
-branch fishriver
-
-git merge emgd
-
-include fishriver.scc
-
-# default policy for standard kernels
-include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
diff --git a/bsp/fishriver/fishriver.cfg b/bsp/fishriver/fishriver.cfg
deleted file mode 100644
index aac611ff88ffdbcd063f26dd445994d8f5f16201..0000000000000000000000000000000000000000
--- a/bsp/fishriver/fishriver.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-CONFIG_X86_32=y
-CONFIG_MATOM=y
-CONFIG_PRINTK=y
-
-# Basic hardware support for the box - network, PCI, sound
-CONFIG_NETDEVICES=y
-CONFIG_ATA=y
-CONFIG_ATA_GENERIC=y
-CONFIG_ATA_SFF=y
-CONFIG_PCI=y
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_R8169=y
-CONFIG_PATA_SCH=y
-CONFIG_MMC_SDHCI_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_NET=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
-CONFIG_SATA_AHCI=y
-CONFIG_AGP=y
-CONFIG_PM=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_INPUT=y
-
-# Make sure these are on, otherwise the bootup won't be fun
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_MODULES=y
-CONFIG_SHMEM=y
-CONFIG_TMPFS=y
-CONFIG_PACKET=y
diff --git a/bsp/fishriver/fishriver.scc b/bsp/fishriver/fishriver.scc
deleted file mode 100644
index 08ae2eca778dc69292ebd23f0272b660923e5109..0000000000000000000000000000000000000000
--- a/bsp/fishriver/fishriver.scc
+++ /dev/null
@@ -1,14 +0,0 @@
-kconf hardware fishriver.cfg
-
-include cfg/x86.scc
-include features/intel-e1xxxx/intel-e100.scc
-include features/intel-e1xxxx/intel-e1xxxx.scc
-include features/drm-emgd/drm-emgd.scc
-include cfg/dmaengine.scc
-include cfg/8250.scc
-include features/ericsson-3g/f5521gw.scc
-include cfg/vesafb.scc
-include features/power/intel.scc
-
-include features/usb/ehci-hcd.scc
-include features/usb/uhci-hcd.scc