diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index f1d98f25931d8f055eccf6a752d3a7bf85554717..76485e713564ef7f2165216d4c2d17e5c9864a89 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -738,19 +738,6 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
 # Create dbd file for GPIB code.
 DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS})))
 
-# Create dbd file with references to all subRecord functions.
-# Problem: functions may be commented out. Better preprocess, but then generate headers first.
-#define maksubfuncfile
-#/static/ {static=1} \
-#/\([\t ]*(struct)?[\t ]*(genSub|sub|aSub)Record[\t ]*\*[\t ]*\w+[\t ]*\)/ { \
-#    match ($$0,/(\w+)[\t ]*\([\t ]*(struct)?[\t ]*\w+Record[\t ]*\*[\t ]*\w+[\t ]*\)/, a); \
-#    n=a[1];if(!static && !f[n]){f[n]=1;print "function (" n ")"}} \
-#/[;{}]/ {static=0}
-#endef 
-#
-#$(shell awk '$(maksubfuncfile)' $(addprefix ../,$(filter %.c %.cc %.C %.cpp, $(SRCS))) > ${SUBFUNCFILE})
-#DBDFILES += $(if $(shell cat ${SUBFUNCFILE}),${SUBFUNCFILE})
-
 # snc location in 3.14: From latest version of module seq or fall back to globally installed snc.
 # In a conda environment we have only one version so this could be simplify
 SNC=$(lastword $(dir ${EPICS_BASE})seq/bin/$(EPICS_HOST_ARCH)/snc $(shell ls -dv ${EPICS_MODULES}/seq/$(or $(seq_VERSION),+([0-9]).+([0-9]).+([0-9]))/bin/${EPICS_HOST_ARCH}/snc 2>/dev/null))
@@ -1010,9 +997,7 @@ ${VERSIONFILE}:
 # EPICS R3.14.*:
 # Create file to fill registry from dbd file.
 ${REGISTRYFILE}: ${MODULEDBD}
-	$(RM) $@ temp.cpp
-	$(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) | grep -v iocshRegisterCommon > temp.cpp
-	$(MV) temp.cpp $@
+	$(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) > $@
 
 # 3.14.12 complains if this rule is not overwritten
 ./%Include.dbd: