Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql	28 Oct 2003 14:28:17 -0000	1.14
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql	1 Nov 2003 10:46:32 -0000	1.15
@@ -31,7 +31,7 @@
 <fullquery name="acs_user::delete.permanent_delete">
       <querytext>
           begin
-              acs_user.del(
+              acs.remove_user(
                   user_id => :user_id
               );
           end;
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql	28 Oct 2003 14:28:17 -0000	1.16
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql	1 Nov 2003 10:46:32 -0000	1.17
@@ -30,7 +30,7 @@
 
 <fullquery name="acs_user::delete.permanent_delete">
       <querytext>
-          select acs_user__delete(:user_id);
+          select acs__remove_user(:user_id);
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	10 Oct 2003 16:34:06 -0000	1.38
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	1 Nov 2003 10:46:32 -0000	1.39
@@ -152,18 +152,14 @@
     return $user_id
 }
 
-ad_proc -public ad_user_remove {
+ad_proc -deprecated -warn ad_user_remove {
     -user_id:required
 } {
-    remove a user from the ACS
+    completely remove a user from the system.
+    Use <code>acs_user::delete -permanent</code> instead
+    @see acs_user::delete
 } {
-    db_exec_plsql user_remove {
-        begin
-            acs.remove_user(
-                user_id => :user_id
-            );
-        end;
-    }
+    acs_user::delete -user_id $user_id -permanent
 }
 
     
@@ -371,10 +367,10 @@
 } {
     if { ! $permanent_p } {
         change_state -user_id $user_id -state "deleted"
+        acs_user::flush_cache -user_id $user_id
     } else {
         db_exec_plsql permanent_delete {}
     }
-    acs_user::flush_cache -user_id $user_id
 }
 
 ad_proc -public acs_user::unapprove {