diff --git a/examples/demo/Makefile b/examples/demo/Makefile
index be83089f6c5043dfc70f64052160c8a943d48fa9..58d8d81ab6a4dfcf2d582b15004758066d8a6476 100644
--- a/examples/demo/Makefile
+++ b/examples/demo/Makefile
@@ -19,12 +19,10 @@ demo_SRCS_vxWorks += -nil-
 #The following adds support from base/src/vxWorks
 demo_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
-LIBRARY_IOC += demoSupport
-demoSupport_LIBS += seq pv
-demoSupport_LIBS += $(EPICS_BASE_IOC_LIBS)
-demoSupport_SRCS += demo.st
+demo_LIBS += seq pv
+demo_LIBS += $(EPICS_BASE_IOC_LIBS)
+demo_SRCS += demo.st
 
-demo_LIBS += demoSupport seq pv
 demo_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 include $(TOP)/configure/RULES
diff --git a/examples/demo/demo_cake_config b/examples/demo/demo_cake_config
deleted file mode 100644
index 0089c0ab04e53c493477bcc80ae6aa2bcd6582b9..0000000000000000000000000000000000000000
--- a/examples/demo/demo_cake_config
+++ /dev/null
@@ -1,29 +0,0 @@
-# CAKE configuration file corresponding to demo.db (relevant to KTL only)
-
-demo-light in ""
-  LIGHT		demo:light	demo:light	BOO BOO b 1
-
-demo-light-on in ""
-  LIGHTON	demo:lightOn	demo:lightOn	DBL DBL d 1
-
-demo-light-off in ""
-  LIGHTOFF	demo:lightOff	demo:lightOff	DBL DBL d 1
-
-demo-voltage in ""
-  VOLTAGE	demo:voltage	demo:voltage	DBL DBL d 1
-
-demo-voltage-2 in ""
-  VOLTAGE2	demo:voltage	demo:voltage	DBL DBL d 1
-
-demo-low-limit in ""
-  LOLIMIT	demo:loLimit	demo:loLimit	DBL DBL d 1
-
-demo-high-limit in ""
-  HILIMIT	demo:hiLimit	demo:hiLimit	DBL DBL d 1
-
-apple in ""
-  APPLE		apple		apple		DBL DBL da:100 1
-
-orange in ""
-  ORANGE	orange		orange		DBL DBL da:100 1
-