diff --git a/ChangeLog b/ChangeLog
index fe0aa2d3..ab29b651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/procargs.h:
+	* sysdeps/common/procargs.c: (glibtop_get_proc_argv_l): Removed SUID 
+	wrappers because glibtop_proc_argv_l is a client-side function that wraps
+	glibtop_get_proc_args.
+
 2004-11-13  Benoît Dejean  <tazforever@dlfp.org>
 
 	* structures.def: Removed old functions. OMG, everything is really broken
diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h
index 1d7159e0..83d2980c 100644
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -85,28 +85,6 @@ glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 #define glibtop_get_proc_argv(proc_args,pid,max_len) glibtop_get_proc_argv_l(glibtop_global_server, proc_args, pid, max_len)
 
 
-#if GLIBTOP_SUID_PROC_ARGS
-
-# define glibtop_get_proc_argv_r		glibtop_get_proc_args_p
-# define glibtop_init_proc_argv_p		glibtop_init_proc_args_p
-
-  char **
-  glibtop_get_proc_argv_p (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-
-
-#else /* !GLIBTOP_SUID_PROC_ARGS */
-
-# define glibtop_get_proc_argv_r		glibtop_get_proc_args_s
-# define glibtop_init_proc_argv_s		glibtop_init_proc_args_s
-
-  char **
-  glibtop_get_proc_argv_s (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-#endif /* GLIBTOP_SUID_PROC_ARGS */
-
-
-
 #ifdef GLIBTOP_NAMES
 
 /* You need to link with -lgtop_names to get this stuff here. */
diff --git a/sysdeps/common/procargs.c b/sysdeps/common/procargs.c
index 13b33f84..ba3b154b 100644
--- a/sysdeps/common/procargs.c
+++ b/sysdeps/common/procargs.c
@@ -41,26 +41,3 @@ glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 	const char * const args0 = glibtop_get_proc_args_l(server, buf, pid, max_len);
 	return split_args0(args0, buf->size);
 }
-
-
-
-#if GLIBTOP_SUID_PROC_ARGS
-
-char **
-glibtop_get_proc_argv_p (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len)
-{
-	const char * const args0 = glibtop_get_proc_args_p(server, buf, pid, max_len);
-	return split_args0(args0, buf->size);
-}
-
-#else /* !GLIBTOP_SUID_PROC_ARGS */
-
-char **
-glibtop_get_proc_argv_s (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len)
-{
-	const char * const args0 = glibtop_get_proc_args_s(server, buf, pid, max_len);
-	return split_args0(args0, buf->size);
-}
-#endif /* GLIBTOP_SUID_PROC_ARGS */