diff --git a/glicid/packages/benchmark.scm b/glicid/packages/benchmark.scm
index 0fff792..7f23d30 100644
--- a/glicid/packages/benchmark.scm
+++ b/glicid/packages/benchmark.scm
@@ -33,32 +33,32 @@
   )
 )
 
-(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma
+;(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma
+;  (transform-package (
+;    (instead-of "openmpi" openmpi-glicid-waves)
+;    intel-mpi-benchmarks/openmpi-2021.3
+;  ) "fab+rdma+ucx+psm2")
+;)
+
+;(define intel-mpi-benchmark-transform-gcc-11
+;  (gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma)
+;)
+
+;(define intel-mpi-benchmarks/openmpi-2021.3-gcc-11
+;  (package 
+;    (inherit intel-mpi-benchmark-transform-gcc-11)
+;    (version (string-append (package-version intel-mpi-benchmark-transform-gcc-11) "-gcc-11" ))
+;  )
+;)
+
+(define-public intel-mpi-benchmarks/openmpi-2021.3-waves
   (transform-package (
-    (instead-of "openmpi" openmpi-glicid-waves)
+    (instead-of "openmpi" openmpi-glicid-waves
     intel-mpi-benchmarks/openmpi-2021.3
-  ) "fab+rdma+ucx+psm2")
+  ) "waves")
+ )
 )
 
-(define intel-mpi-benchmark-transform-gcc-11
-  (gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma)
-)
-
-(define intel-mpi-benchmarks/openmpi-2021.3-gcc-11
-  (package 
-    (inherit intel-mpi-benchmark-transform-gcc-11)
-    (version (string-append (package-version intel-mpi-benchmark-transform-gcc-11) "-gcc-11" ))
-  )
-)
-
-(define-public intel-mpi-benchmarks/openmpi-2021.3-all-ccipl
-  (transform-package (
-    (instead-of "openmpi" openmpi-glicid-libfabric-rdma-ucx-ccipl)
-    intel-mpi-benchmarks/openmpi-2021.3
-  ) "ccipl")
-)
-
-
 (define-public stream-benchmarks
   (package
     (name "stream-benchmarks")