Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl	10 Jan 2007 21:22:03 -0000	1.6
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl	30 Mar 2013 19:07:23 -0000	1.7
@@ -29,9 +29,9 @@
          db_foreach fetch_paths { *SQL* } {
 
              # try to remove file from filesystem
-             set file "[cr_fs_path $storage_area_key]/${path}"
+             set file [cr_fs_path $storage_area_key]/$path
              ns_log Debug "cr_delete_scheduled_files: deleting $file"
-             ns_unlink  -nocomplain "$file"
+             file delete $file
          }
          # now that all scheduled files deleted, clear table
          db_dml delete_files { *SQL* }
Index: openacs-4/packages/acs-mail-lite/tcl/incoming-mail-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/incoming-mail-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-mail-lite/tcl/incoming-mail-procs.tcl	17 Oct 2010 21:06:08 -0000	1.5
+++ openacs-4/packages/acs-mail-lite/tcl/incoming-mail-procs.tcl	30 Mar 2013 19:07:23 -0000	1.6
@@ -108,7 +108,7 @@
 	    }
 
             #let's delete the file now
-            if {[catch {ns_unlink $msg} errmsg]} {
+            if {[catch {file delete $msg} errmsg]} {
                 ns_log Error "load_mails: unable to delete queued message $msg: $errmsg"
             } else {
 		ns_log Debug "load_mails: deleted $msg"
@@ -172,8 +172,8 @@
 	    set stream [open $file]
 	    set content [read $stream]
 	    close $stream
-	    ns_log error "$content"
-	    ns_unlink $file
+	    ns_log error $content
+	    file delete $file
 	    return
 	}
 	
Index: openacs-4/packages/acs-subsite/www/shared/1pixel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/1pixel.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/shared/1pixel.tcl	26 Feb 2005 17:52:20 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/shared/1pixel.tcl	30 Mar 2013 19:07:24 -0000	1.5
@@ -15,7 +15,7 @@
 ReturnHeaders "image/gif"
 
 if { [catch {
-    set file [open "[acs_package_root_dir "acs-subsite"]/www/shared/1pixel.header"]
+    set file [open [acs_package_root_dir "acs-subsite"]/www/shared/1pixel.header]
     ns_writefp $file
     close $file
 
@@ -27,13 +27,13 @@
     ns_log "Notice" "logging to $file_name"
     set file [open $file_name w+]
     fconfigure $file -encoding binary -translation binary
-    puts -nonewline $file "[format "%c%c%c" $r $g $b]"
+    puts -nonewline $file [format "%c%c%c" $r $g $b]
     seek $file 0
     ns_writefp $file
     close $file
-    ns_unlink $file_name
+    file delete $file_name
 
-    set file [open "[acs_package_root_dir "acs-subsite"]/www/shared/1pixel.footer"]
+    set file [open [acs_package_root_dir "acs-subsite"]/www/shared/1pixel.footer]
     ns_writefp $file
     close $file
 
Index: openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl	18 Nov 2012 18:47:20 -0000	1.20
+++ openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl	30 Mar 2013 19:07:24 -0000	1.21
@@ -238,7 +238,7 @@
 	ad_script_abort
     }
 
-    ns_unlink $tmpfile
+    file delete $tmpfile
 
     if { $try == $max_retry } {
         return -code error "webspell: Tried to execute spellchecker $max_retry times but it did not work out. Sorry!"
Index: openacs-4/packages/file-storage/www/admin/rss-subscr-del.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/admin/rss-subscr-del.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/admin/rss-subscr-del.tcl	13 Jan 2005 13:58:13 -0000	1.2
+++ openacs-4/packages/file-storage/www/admin/rss-subscr-del.tcl	30 Mar 2013 19:07:24 -0000	1.3
@@ -18,7 +18,7 @@
 } -edit_data {
     #here's where we actually do the delete.
     db_exec_plsql delete_subscr {}
-    ns_unlink -nocomplain [rss_gen_report_file -summary_context_id $subscr_id -impl_name fs_rss]
+    file delete [rss_gen_report_file -summary_context_id $subscr_id -impl_name fs_rss]
 } -after_submit {
     ad_returnredirect rss-subscrs?folder_id=$folder_id
     ad_script_abort
Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -N -r1.36 -r1.37
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	31 Jul 2011 23:11:46 -0000	1.36
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	30 Mar 2013 19:07:24 -0000	1.37
@@ -311,7 +311,7 @@
             # the rest of the foreach as well
             if { $is_auto_reply_p } {
                 ns_log Debug "load_qmail_mail_queue: message $msg is from an auto-responder, skipping"
-                if {[catch {ns_unlink $msg} errmsg]} {
+                if {[catch {file delete $msg} errmsg]} {
                     ns_log Warning "load_qmail_mail_queue: couldn't remove message $msg:  $errmsg"
                 }
                 continue
@@ -349,7 +349,7 @@
 		    -message_headers $orig_headers \
 		    -reason "Invalid sender.  You must be a member of the site and\nyour From address must match your registered address."
 
-                if {[catch {ns_unlink $msg} errmsg]} {
+                if {[catch {file delete $msg} errmsg]} {
                     ns_log Warning "load_qmail_mail_queue: couldn't remove message $msg: $errmsg"
                 }
                 continue
@@ -367,7 +367,7 @@
 		    -message_headers $orig_headers \
 		    -reason "Invalid To Address"
 
-                if {[catch {ns_unlink $msg} errmsg]} {
+                if {[catch {file delete $msg} errmsg]} {
                     ns_log Warning "load_qmail_mail_queue: couldn't remove message file $msg: $errmsg"
                 }
                 continue
@@ -387,7 +387,7 @@
 	        set headers $orig_headers
                 db_dml holdinsert {} -clobs [list $to_addr $headers $body]
 
-                if {[catch {ns_unlink $msg} errmsg]} { 
+                if {[catch {file delete $msg} errmsg]} { 
 		    ns_log Error "load_qmail_mail_queue: unable to delete queued message $msg: $errmsg"
 		}
 
Index: openacs-4/packages/rss-support/www/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/rss-support/www/delete-2.tcl	17 May 2003 11:23:29 -0000	1.2
+++ openacs-4/packages/rss-support/www/delete-2.tcl	30 Mar 2013 19:07:24 -0000	1.3
@@ -9,7 +9,7 @@
 ad_require_permission $subscr_id admin
 
 if [info exists delete_file_p] {
-    ns_unlink -nocomplain [rss_gen_report_file -subscr_id $subscr_id]
+    file delete [rss_gen_report_file -subscr_id $subscr_id]
 }
 
 db_exec_plsql delete_subscr {}
Index: openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl	10 Apr 2008 15:29:34 -0000	1.6
+++ openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl	30 Mar 2013 19:07:24 -0000	1.7
@@ -72,7 +72,7 @@
         append text [read $fp]
     }
     close $fp
-    ns_unlink $filename
+    file delete $filename
     return $text
 }