diff --git a/startup.script_common b/startup.script_common
index 2f8405b..98a8106 100644
--- a/startup.script_common
+++ b/startup.script_common
@@ -19,15 +19,10 @@ putenv STRINGBUFFER
 STREAM_PROTOCOL_DIR=malloc(80)
 sprintf STREAM_PROTOCOL_DIR, "%s/cfg", HOME
 
-# Need to branch a few times on EPICS base release
-R3       = strncmp(EPICS,"R3.",3)==0
-R7       = strncmp(EPICS,"R7.",3)==0
-
 # Load PVA only with more than 32 MB RAM
-PVA      = R7 && (PVA||(sysPhysMemTop()&0xfc000000)) && !getenv("NOPVA")
+PVA      = (PVA||(sysPhysMemTop()&0xfc000000)) && !getenv("NOPVA")
 
-# Time server (must be set before loading iocCoreLibrary.munch for 3.14.12)
-# Need EPICS_TS_FORCE_NTPTIME for 7.0
+# Time server (must be set before loading EPICS core)
 putenv "EPICS_TS_NTP_INET=129.129.190.1"
 putenv "EPICS_TS_FORCE_NTPTIME=YES"
 
@@ -38,7 +33,7 @@ printf "loading %s\n",STRINGBUFFER
 sprintf STRINGBUFFER,"%s",ld(0,0,STRINGBUFFER)?"":"shellScriptAbort"
 execute STRINGBUFFER
 
-# Setup Time (must be set after loading iocCoreLibrary.munch)
+# Setup Time (must be set after loading EPICS core)
 # 2025:
 putenv "EPICS_TIMEZONE=MET::-60:033102:102703"
 putenv "TIMEZONE=MET::-60:033102:102703"
diff --git a/startup.script_linux b/startup.script_linux
index 8f3e564..1b7c684 100644
--- a/startup.script_linux
+++ b/startup.script_linux
@@ -1,17 +1,15 @@
-# set EPICS according to BASE or default to 3.14.12
-epicsEnvSet EPICS R$(EPICS_RELEASE=$(BASE=3.14.12))
+# set EPICS variable (in case anyone still needs it)
+epicsEnvSet EPICS R$(EPICS_RELEASE)
 
 # Start Logging
-date 'epicsEnvSet IOC_STARTTIME "%Y-%m-%dT%H:%M:%S"' > /tmp/$(IOC).starttime
+date 'epicsEnvSet IOC_STARTTIME "%Y-%m-%d %H:%M:%S"' > /tmp/$(IOC).starttime
 < /tmp/$(IOC).starttime
 system "rm /tmp/$(IOC).starttime"
 epicsEnvSet EPICS_IOC_LOG_INET $(EPICS_IOC_LOG_INET=gfa-syslog-03)
 epicsEnvSet EPICS_IOC_LOG_PORT $(EPICS_IOC_LOG_PORT=1514)
-
-# iocLogPrefix will fail for EPICS 3 but that's OK
 iocLogPrefix "$(IOC) "
 iocLogInit
-errlog "starting EPICS $(EPICS) at $(IOC_STARTTIME)"
+errlog "starting EPICS R$(EPICS_RELEASE) at $(IOC_STARTTIME)"
 
 # Set up CA search lists for different networks
 # ip command is supported by IFC1210, Moxa (old and new), Deltatau, Zynq, NI, SL6, RHEL7, Debian10
@@ -89,9 +87,6 @@ require iocinfo $(iocinfo_VERSION=ifexists)
 
 # caPutLog
 epicsEnvSet EPICS_CA_PUT_LOG_ADDR, "gfa-syslog-03:1515"
-# Set EPICS_CA_PUT_LOG_PREFIX for EPICS 3 but not for 7 because there we have iocLogPrefix
-epicsEnvSet EPICS_CA_PUT_LOG_PREFIX_CMD_3 "epicsEnvSet EPICS_CA_PUT_LOG_PREFIX $(IOC)"
-$(EPICS_CA_PUT_LOG_PREFIX_CMD_$(EPICS_VERSION_MAJOR=3)=)
 require caPutLog $(caPutLog_VERSION=ifexists)
 
 # sw installation version number