diff --git a/startup/Site.cshrc b/startup/Site.cshrc
index b0f42bae1..6d726e5aa 100755
--- a/startup/Site.cshrc
+++ b/startup/Site.cshrc
@@ -14,7 +14,7 @@
 
 # Location of epics base
 if ( ! $?EPICS_BASE ) then
-	setenv EPICS_BASE /usr/local/epics/base
+	set EPICS_BASE=/usr/local/epics/base
 endif
 
 # Location of epics extensions
@@ -22,14 +22,13 @@ if ( ! $?EPICS_EXTENSIONS ) then
 	setenv EPICS_EXTENSIONS /usr/local/epics/extensions
 endif
 
-# Time service:
-# EPICS_TS_NTP_INET ntp or Unix time server ip addr.
-
 # Postscript printer definition needed by some extensions (eg medm, dp, dm, ...)
-setenv PSPRINTER lp
+if ( ! $?PSPRINTTER ) then
+    setenv PSPRINTER lp
+endif
 
 # Needed only by medm extension
-setenv EPICS_DISPLAY_PATH
+#setenv EPICS_DISPLAY_PATH
 
 # Needed only by orbitscreen extension
 if ( ! $?ORBITSCREENHOME ) then
@@ -61,92 +60,57 @@ endif
 
 # Start of set R3.14 environment variables
 
-if ( -e /usr/local/etc/setup/EpicsHostArch.pl ) then
-   setenv EPICS_HOST_ARCH `/usr/local/etc/setup/EpicsHostArch.pl`
-else
-   setenv EPICS_HOST_ARCH `/usr/local/epics/startup/EpicsHostArch.pl`
-endif
+setenv EPICS_HOST_ARCH `$EPICS_BASE/startup/EpicsHostArch.pl`
 
 # Allow private versions of base
 if ( $?EPICS_BASE_PVT ) then
    if ( -e $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH ) then
       set path = ( $path $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH)
    endif
-   if ( -e $EPICS_BASE_PVT/lib/$EPICS_HOST_ARCH ) then
-      if ( $?LD_LIBRARY_PATH ) then
-         setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
-      else
-         setenv LD_LIBRARY_PATH "${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
-      endif
-   endif
 endif
 
-set path = ( $path $EPICS_BASE/bin/$EPICS_HOST_ARCH )
-
 # Allow private versions of extensions
 if ( $?EPICS_EXTENSIONS_PVT ) then
    if ( -e $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH ) then
       set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH)
    endif
-   if ( -e $EPICS_EXTENSIONS_PVT/lib/$EPICS_HOST_ARCH ) then
-      if ( $?LD_LIBRARY_PATH ) then
-         setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
-      else
-         setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
-      endif
-   endif
 endif
-
 set path = ( $path $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH )
 
-# Needed if shared base libraries are built
-if ( $?LD_LIBRARY_PATH ) then
-   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
-else
-   setenv LD_LIBRARY_PATH "${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
-endif
-
-# Needed if shared extension libraries are built
-if ( $?LD_LIBRARY_PATH ) then
-   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
-else
-   setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
-endif
-
 # End of set R3.14 environment variables
 ##################################################################
 
 
-# Start of set pre R3.14 environment variables
-
-# Time service:
-# EPICS_TS_MIN_WEST the local time difference from GMT.
-setenv EPICS_TS_MIN_WEST 360
-
-if ( -e /usr/local/etc/setup/HostArch.pl ) then
-   setenv HOST_ARCH `/usr/local/etc/setup/HostArch.pl`
-else
-   setenv HOST_ARCH `/usr/local/epics/startup/HostArch.pl`
-endif
-
-# Allow private versions of extensions
-if ( $?EPICS_EXTENSIONS_PVT ) then
-   if ( -e $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH ) then
-      set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH)
-   endif
-   # Needed if shared extension libraries are built
-   if ( -e $EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH ) then
-      if ( $?LD_LIBRARY_PATH ) then
-         setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
-      else
-         setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
-      endif
-   endif
-endif
-
-set path = ( $path $EPICS_EXTENSIONS/bin/$HOST_ARCH )
-# Needed if shared extension libraries are built
-setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
+## Start of set pre R3.14 environment variables
+#
+## Time service:
+## EPICS_TS_MIN_WEST the local time difference from GMT.
+#setenv EPICS_TS_MIN_WEST 360
+#
+#if ( -e /usr/local/etc/setup/HostArch.pl ) then
+#   setenv HOST_ARCH `/usr/local/etc/setup/HostArch.pl`
+#else
+#   setenv HOST_ARCH `/usr/local/epics/startup/HostArch.pl`
+#endif
+#
+## Allow private versions of extensions
+#if ( $?EPICS_EXTENSIONS_PVT ) then
+#   if ( -e $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH ) then
+#      set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH)
+#   endif
+#   # Needed if shared extension libraries are built
+#   if ( -e $EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH ) then
+#      if ( $?LD_LIBRARY_PATH ) then
+#         setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+#      else
+#         setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
+#      endif
+#   endif
+#endif
+#
+#set path = ( $path $EPICS_EXTENSIONS/bin/$HOST_ARCH )
+## Needed if shared extension libraries are built
+#setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
 
 # End of set pre R3.14 environment variables
 ##################################################################
diff --git a/startup/Site.profile b/startup/Site.profile
index f2b2d22fa..654429103 100755
--- a/startup/Site.profile
+++ b/startup/Site.profile
@@ -14,32 +14,29 @@
 
 # Location of epics base
 if [ -z "${EPICS_BASE}" ] ; then
-	EPICS_BASE=/usr/local/epics/extensions
-	export EPICS_BASE
+	EPICS_BASE=/usr/local/epics/base
 fi
 
-# Location of epics extensions
+# Location of epics extensions (medm, msi, etc.)
 if [ -z "${EPICS_EXTENSIONS}" ] ; then
 	EPICS_EXTENSIONS=/usr/local/epics/extensions
-	export EPICS_EXTENSIONS
 fi
 
-# Time service:
-# EPICS_TS_NTP_INET ntp or Unix time server ip addr.
-
 # Postscript printer definition needed by some extensions (eg medm, dp, dm, ...)
-PSPRINTER=lp
-export PSPRINTER
+if [ -z "${PSPRINTER}" ] ; then
+    export PSPRINTER=lp
+fi
+
+#Needed only by the idl and ezcaIDL extensions.
+#export EPICS_EXTENSIONS
 
 # Needed only by medm extension
-#setenv EPICS_DISPLAY_PATH
-#export EPICS_DISPLAY_PATH
+#export EPICS_DISPLAY_PATH=/path/to/adl/files
 
 # Needed only by orbitscreen extension
-if [ -z "${ORBITSCREENHOME}" ] ; then
-	ORBITSCREENHOME=$EPICS_EXTENSIONS/src/orbitscreen
-	export ORBITSCREENHOME
-fi
+#if [ -z "${ORBITSCREENHOME}" ] ; then
+#	export "ORBITSCREENHOME=${EPICS_EXTENSIONS/src/orbitscreen}"
+#fi
 
 # Needed only by adt extension
 #if [ -z "${ADTHOME}" ] ; then
@@ -57,6 +54,7 @@ if [ -z "${CLASSPATH}" ] ; then
 else
 	CLASSPATH="${CLASSPATH}:${EPICS_EXTENSIONS}/javalib"
 fi
+export CLASSPATH
 
 # Allow private versions of extensions without a bin subdir
 if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
@@ -65,115 +63,55 @@ fi
 
 #---------------------------------------------------------------
 # Start of set R3.14 environment variables
-
-EPICS_HOST_ARCH=`/usr/local/epics/startup/EpicsHostArch.pl`
+#
+EPICS_HOST_ARCH=`"${EPICS_BASE}"/startup/EpicsHostArch.pl`
 export EPICS_HOST_ARCH
 
 # Allow private versions of base
 if [ -n "${EPICS_BASE_PVT}" ] ; then
-	if [ -d $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH ]; then
+	if [ -d "${EPICS_BASE_PVT}/bin/${EPICS_HOST_ARCH}" ]; then
 		PATH="${PATH}:${EPICS_BASE_PVT}/bin/${EPICS_HOST_ARCH}"
 	fi
-	# Needed if shared extension libraries are built
-	if [ -d $EPICS_BASE_PVT/lib/$EPICS_HOST_ARCH ]; then
-		if [ -z "${LD_LIBRARY_PATH}" ] ; then
-			LD_LIBRARY_PATH="${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
-		else
-			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE_PVT}/lib/${EPICS_HOST_ARCH}"
-		fi
-	fi
 fi
 
-PATH="${PATH}:${EPICS_BASE}/bin/${EPICS_HOST_ARCH}"
-
 # Allow private versions of extensions
 if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
-	if [ -d $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH ]; then
+	if [ -d "${EPICS_EXTENSIONS_PVT}/bin/${EPICS_HOST_ARCH}" ]; then
 		PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${EPICS_HOST_ARCH}"
 	fi
-	# Needed if shared extension libraries are built
-	if [ -d $EPICS_EXTENSIONS_PVT/lib/$EPICS_HOST_ARCH ]; then
-		if [ -z "${LD_LIBRARY_PATH}" ] ; then
-			LD_LIBRARY_PATH="${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
-		else
-			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${EPICS_HOST_ARCH}"
-		fi
-	fi
 fi
-
 PATH="${PATH}:${EPICS_EXTENSIONS}/bin/${EPICS_HOST_ARCH}"
 
-# Needed if shared base libraries are built
-if [ -z "${LD_LIBRARY_PATH}" ] ; then
-	LD_LIBRARY_PATH="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
-else
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
-fi
-
-# Needed if shared extension libraries are built
-if [ -z "${LD_LIBRARY_PATH}" ] ; then
-	LD_LIBRARY_PATH="${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
-else
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${EPICS_HOST_ARCH}"
-fi
-
 # End of set R3.14 environment variables
 
 #---------------------------------------------------------------
-
-# Start of set pre R3.14 environment variables
-
-# Time service:
-# EPICS_TS_MIN_WEST the local time difference from GMT.
-EPICS_TS_MIN_WEST=360
-export EPICS_TS_MIN_WEST
-
-HOST_ARCH=`/usr/local/epics/startup/HostArch.pl`
-export HOST_ARCH
-
-# Allow private versions of base
-if [ -n "${EPICS_BASE_PVT}" ] ; then
-	if [ -d $EPICS_BASE_PVT/bin/$HOST_ARCH ]; then
-		PATH="${PATH}:${EPICS_BASE_PVT}/bin/${HOST_ARCH}"
-	fi
-	# Needed if shared extension libraries are built
-	if [ -d $EPICS_BASE_PVT/lib/$HOST_ARCH ]; then
-		if [ -z "${LD_LIBRARY_PATH}" ] ; then
-			LD_LIBRARY_PATH="${EPICS_BASE_PVT}/lib/${HOST_ARCH}"
-		else
-			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE_PVT}/lib/${HOST_ARCH}"
-		fi
-	fi
-fi
-
-PATH="${PATH}:${EPICS_BASE}/lib/${HOST_ARCH}"
-# Needed if shared base libraries are built
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_BASE}/lib/${HOST_ARCH}"
-
-# Allow private versions of extensions
-if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
-	if [ -d $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH ]; then
-		PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}"
-	fi
-	# Needed if shared extension libraries are built
-	if [ -d $EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH ]; then
-		if [ -z "${LD_LIBRARY_PATH}" ] ; then
-			LD_LIBRARY_PATH="${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
-		else
-			LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}"
-		fi
-	fi
-fi
-
-PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
-# Needed if shared extension libraries are built
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
-
+#
+## Start of set pre R3.14 environment variables
+#
+## Time service:
+## EPICS_TS_MIN_WEST the local time difference from GMT.
+#EPICS_TS_MIN_WEST=360
+#export EPICS_TS_MIN_WEST
+#
+#HOST_ARCH=`"${EPICS_BASE}"/startup/HostArch.pl`
+#export HOST_ARCH
+#
+## Allow private versions of base
+#if [ -n "${EPICS_BASE_PVT}" ] ; then
+#	if [ -d "${EPICS_BASE_PVT}/bin/${HOST_ARCH}" ]; then
+#		PATH="${PATH}:${EPICS_BASE_PVT}/bin/${HOST_ARCH}"
+#	fi
+#fi
+#
+## Allow private versions of extensions
+#if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then
+#	if [ -d "${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}" ]; then
+#		PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}"
+#	fi
+#fi
+#
+#PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}"
+#
 # End of set pre R3.14 environment variables
 
 #---------------------------------------------------------------
-
-export PATH
-export LD_LIBRARY_PATH
-export CLASSPATH
-