diff --git a/plugins/oracle/oracle_sysstat_ b/plugins/oracle/oracle_sysstat_
index 4cbace67..e72872f2 100755
--- a/plugins/oracle/oracle_sysstat_
+++ b/plugins/oracle/oracle_sysstat_
@@ -691,8 +691,6 @@ FROM
       wait_class
     FROM
       v\$event_name
-    WHERE
-      wait_class NOT IN ( 'Other', 'Idle' )
     GROUP BY
       wait_class
   ) en
@@ -701,22 +699,7 @@ ON
   en.wait_class = se.wait_class AND 
   se.username is not null
 GROUP BY
-  en.wait_class
-;
-SELECT 
-  'Other.value ' || count(wait_class)
-FROM
-  v\$session
-WHERE
-  wait_class = 'Other' AND username is not null
-;
-SELECT 
-  'Idle.value ' || count(wait_class)
-FROM
-  v\$session
-WHERE
-  wait_class = 'Idle' AND username is not null
-;
+  en.wait_class;
 EOF
 }
 
@@ -751,7 +734,7 @@ FROM
     FROM
       v\$event_name
     WHERE
-      wait_class NOT IN ( 'Other', 'Idle' )
+      wait_class NOT IN ( 'Idle' )
     GROUP BY
       wait_class
   ) en
@@ -759,15 +742,7 @@ FROM
 ON
   en.wait_class = se.wait_class
 GROUP BY
-  en.wait_class
-;
-SELECT 
-  'Other.value ' || NVL( SUM(time_waited_micro), 0 )
-FROM
-  v\$system_event
-WHERE
-  wait_class = 'Other'
-;
+  en.wait_class;
 EOF
 }