--- orig_csh.cshrc	2009-06-05 18:00:15.896122811 -0400
+++ csh.cshrc	2009-06-05 18:01:38.996855775 -0400
@@ -17,36 +17,6 @@
 
 
 ##
-## Start by unsetting all our variables.  This is needed to prevent inheritance
-## from the shell that started us -- e.g. when performing a 'su'.
-##
-unsetenv TCSH_SHELL_CTRLD
-unsetenv TCSH_SHELL_SAFEHISTORY
-unsetenv TCSH_SHELL_AUTOLOGOUT
-unsetenv TCSH_SHELL_SAFETY
-unsetenv TCSH_SHELL_DOS
-unsetenv TCSH_SHELL_CDALIAS
-unsetenv TCSH_SHELL_COMPLETION
-
-
-##
-## Get our own settings.  Make sure they exist in the user's directory.
-##
-if ( ! -e ~/.tcsh.config ) then
-    if ( -e /etc/skel/.tcsh.config ) then
-        echo ">>> Copying /etc/skel/.tcsh.config to your home directory ..."
-        cp /etc/skel/.tcsh.config ~/.tcsh.config
-        echo ">>> Please edit it to fine-tune the TCSH behaviour."
-    else
-        echo "### Missing .tcsh.config!"
-    endif
-endif
-if ( -e ~/.tcsh.config ) then
-    source ~/.tcsh.config
-endif
-
-
-##
 ## Load the environment defaults.
 ##
 if ( -r /etc/csh.env ) then
@@ -115,10 +85,8 @@
 ##
 ## Load our command completions -- for interactive shells only
 ##
-if ( $?TCSH_SHELL_COMPLETION ) then
-    if ( -e /etc/profile.d/tcsh-complete ) then
-        source /etc/profile.d/tcsh-complete
-    endif
+if ( -e /etc/profile.d/tcsh-complete ) then
+    source /etc/profile.d/tcsh-complete
 endif