diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm
index c7e823f..2172a50 100644
--- a/glicid/packages/virtualization.scm
+++ b/glicid/packages/virtualization.scm
@@ -1,99 +1,50 @@
 (define-module (glicid packages virtualization)
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
-  #:use-module (gnu packages)
-  #:use-module (guix utils)
-  #:use-module (gnu packages virtualization)
-  #:use-module (gnu packages storage)
-  #:use-module (guix download)
-  #:use-module (glicid utils)
-;  #:use-module (glicid packages storage)
-)
+               #:use-module (guix packages)
+               #:use-module (guix gexp)
+               #:use-module (gnu packages)
+               #:use-module (guix utils)
+               #:use-module (gnu packages virtualization)
+               #:use-module (gnu packages storage)
+               #:use-module (guix download)
+               #:use-module (glicid utils))
 
-
-
-;(define local-qemu qemu-7.0-upstream)
-
-;(define qemu-latest (latest-version local-qemu qemu))
-
-;(define local-qemu-minimal qemu-minimal-7.0-upstream)
-
-;(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
-
-;; current guix version is latest.
 (define-public qemu-latest qemu)
 (define-public qemu-minimal-latest qemu-minimal)
 
-
 (define-public qemu-with-rbd
-  (package
-    (inherit qemu-latest) 
-    (name "qemu-with-rbd")
-
-    (arguments
-     (substitute-keyword-arguments (package-arguments qemu)
-       ((#:tests? _ #f)
-        ;; FIXME: To run the test suite, fix all the instances where scripts
-        ;; generates "#! /bin/sh" shebangs.
-        #f)
-      )
-    )    
-
-    (inputs `(
-      ("ceph:lib", ceph "lib")
-      ,@(package-inputs qemu)
-    ))
-  )
-)
-
-
-;(define-public qemu-with-rbd
-;  (package
-;    (inherit qemu-latest) 
-;    (name "qemu-with-rbd")
-;    (arguments
-;      (substitute-keyword-arguments `(
-;        #:tests? #f
-;        ,@(package-arguments qemu)
-;      ))
-;    ) 
-;    (inputs `(
-;      ("ceph:lib", ceph "lib")
-;      ,@(package-inputs qemu)
-;    ))
-;  )
-;)
-
+               (package
+                 (inherit qemu-latest) 
+                 (name "qemu-with-rbd")
+                 (arguments
+                   (substitute-keyword-arguments
+                     (package-arguments qemu)
+                     ((#:tests? _ #f)
+                      #f))) 
+                 (inputs `(
+                           ("ceph:lib", ceph "lib")
+                           ,@(package-inputs qemu)))))
 
 (define-public qemu-minimal-with-rbd
-  (package
-    (inherit qemu-minimal-latest) 
-    (name "qemu-minimal-with-rbd")
-    (arguments
-      (substitute-keyword-arguments `(
-        #:tests? #f
-        ,@(package-arguments qemu-minimal)
-      ))
-    ) 
-    (inputs `(
-      ("ceph:lib", ceph "lib" )
-      ,@(package-inputs qemu-minimal)
-    ))
-  )
-)
+               (package
+                 (inherit qemu-minimal-latest) 
+                 (name "qemu-minimal-with-rbd")
+                 (arguments
+                   (substitute-keyword-arguments
+                     `(
+                       #:tests? #f
+                       ,@(package-arguments qemu-minimal)))) 
+                 (inputs `(
+                           ("ceph:lib", ceph "lib" )
+                           ,@(package-inputs qemu-minimal)))))
 
 (define-public libvirt-8.5
-  (package
-    (inherit libvirt)
-    (name "libvirt")
-    (version "8.5.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz"))
-        (sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
-        (patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))
-      )
-    )
-  )
-)
+               (package
+                 (inherit libvirt)
+                 (name "libvirt")
+                 (version "8.5.0")
+                 (source
+                   (origin
+                     (method url-fetch)
+                     (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz"))
+                     (sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
+                     (patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))))))