diff --git a/conf/pips/general.json b/conf/pips/general.json
index e007be7e..1a06ad3f 100644
--- a/conf/pips/general.json
+++ b/conf/pips/general.json
@@ -7,7 +7,6 @@
         }
     },
     "rhel-6": {
-        # For testing
         "coverage": {
             "version": "3.5.1"
         },
diff --git a/conf/pips/horizon.json b/conf/pips/horizon.json
index a0cf7499..72ff8694 100644
--- a/conf/pips/horizon.json
+++ b/conf/pips/horizon.json
@@ -27,7 +27,6 @@
         "sqlalchemy-migrate": {
             "version": "0.7.2"
         },
-        #this one is sort of odd...
         "python-cloudfiles": {
             "version": "1.7.9.3"
         },
diff --git a/conf/pips/tempest.json b/conf/pips/tempest.json
deleted file mode 100644
index f36f5b3a..00000000
--- a/conf/pips/tempest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "ubuntu-oneiric": {
-        "pika": {
-            "version": "0.9.5"
-        }
-    },
-    "rhel-6": {}
-}
diff --git a/conf/pkgs/n-vol.json b/conf/pkgs/n-vol.json
index 34c63243..3d32a8f4 100644
--- a/conf/pkgs/n-vol.json
+++ b/conf/pkgs/n-vol.json
@@ -5,12 +5,10 @@
     # that we are trying to align other distributions with.
     # The versions should at least be major + minor!
     "ubuntu-oneiric": {
-        # Linux SCSI target framework
         "tgt": {
             "version": "1:1*",
             "removable": true
         },
-        # Need for ietadm, which is run by stack script 
         "iscsitarget": {
             "version": "1.4*",
             "removable": true