Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -r63e3fa80bf7f84e1996c35df814c507cff9c4c58 -r4982dee5cff4f3d595d5b2d6d923daac76898dc2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 63e3fa80bf7f84e1996c35df814c507cff9c4c58)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 4982dee5cff4f3d595d5b2d6d923daac76898dc2)
@@ -202,24 +202,7 @@
 		
 		Integer orgId = WebUtil.readIntParam(request,"orgId");
 		Integer userId = WebUtil.readIntParam(request,"userId",true);
-		User user = (User)getService().findById(User.class,userId);
-		Workspace workspace = user.getWorkspace();
-		WorkspaceFolder wf = workspace.getDefaultFolder();		
-		Set wwfs = workspace.getWorkspaceWorkspaceFolders();
-		
-		Iterator iter = wwfs.iterator();
-		if (iter.hasNext()) {
-			WorkspaceWorkspaceFolder wwf = (WorkspaceWorkspaceFolder)iter.next();
-			if (!iter.hasNext()) {				
-				log.debug("deleting wkspc_wkspc_folder: "+wwf.getId());
-				getService().delete(wwf);
-				getService().delete(wf);
-				getService().delete(workspace);
-				getService().delete(user);
-				log.debug("deleted user: "+userId);
-			}
-		}
-		
+		getService().removeUser(userId);
 		request.setAttribute("org",orgId);
 		return mapping.findForward("userlist");
 	}
@@ -288,4 +271,4 @@
 		}
 		return service;
 	}
-}
+}
\ No newline at end of file