diff --git a/conf/pips/general.json b/conf/pips/general.json
deleted file mode 100644
index e753facf..00000000
--- a/conf/pips/general.json
+++ /dev/null
@@ -1,15 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "rhel-6": {
-        "coverage": {
-            "version": "3.5.1"
-        },
-        "nose": {
-            "version": "1.1.2"
-        },
-        "mock": {
-            "version": "0.8.0"
-        }
-    }
-}
diff --git a/conf/pips/glance.json b/conf/pips/glance.json
deleted file mode 100644
index 5d5787ae..00000000
--- a/conf/pips/glance.json
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "rhel-6": {
-        "SQLAlchemy": {
-            "version": "0.7.5"
-        },
-        "Routes": {
-            "version": "1.12.3"
-        },
-        #the base is 2.0, need to upgrade
-        "pycrypto": {
-            "version": "2.5",
-            "options": "--upgrade"
-        },
-        #the newest we can get is 1.3.3 from epel/rhel
-        #this causes issues like the following
-        #https://answers.launchpad.net/nova/+question/174160
-        "PasteDeploy": {
-            "version": "1.5.0"
-        },
-        "iso8601": {
-            "version": "0.1.4"
-        }
-    }
-}
diff --git a/conf/pips/horizon.json b/conf/pips/horizon.json
deleted file mode 100644
index 7a72695d..00000000
--- a/conf/pips/horizon.json
+++ /dev/null
@@ -1,68 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "rhel-6": {
-        #the base is 2.0, need to upgrade
-        "pycrypto": {
-            "version": "2.5",
-            "options": "--upgrade"
-        },
-        #the newest we can get is 1.3.3 from epel/rhel
-        #this causes issues like the following
-        #https://answers.launchpad.net/nova/+question/174160
-        #https://answers.launchpad.net/nova/+question/185116
-        "PasteDeploy": {
-            "version": "1.5"
-        },
-        "PasteScript": {
-            "version": "1.7.5"
-        },
-        "Paste": {
-            "version": "1.7.5.1"
-        },
-        "SQLAlchemy": {
-            "version": "0.7.5"
-        },
-        "sqlalchemy-migrate": {
-            "version": "0.7.2"
-        },
-        "python-cloudfiles": {
-            "version": "1.7.9.3"
-        },
-        "CherryPy": {
-            "version": "3.2.2"
-        },
-        #the base os doesn't have static files which
-        #seems only in 1.3 or greater
-        "django" : {
-            "version": "1.3.1"
-        },
-        "django-nose" : {
-            "version": "0.1.3"
-        },
-        "django-nose-selenium": {
-            "version": "0.7.3"
-        },
-        "django-registration" : {
-            "version": "0.7"
-        },
-        "django-mailer" : {
-            "version": "0.1.0"
-        },
-        "django-staticfiles" : {
-            "version": "1.1.2"
-        },
-        "Routes": {
-            "version": "1.12.3"
-        }
-    },
-    "fedora-16": {
-        # rpm 1.7.9.1 does not have exceptions.Error
-        "python-cloudfiles": {
-            "version": "1.7.9.3"
-        },
-        "django-nose" : {
-            "version": "0.1.3"
-        }
-    }
-}
diff --git a/conf/pips/keystone.json b/conf/pips/keystone.json
deleted file mode 100644
index f5713a78..00000000
--- a/conf/pips/keystone.json
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "rhel-6": {
-        "SQLAlchemy": {
-            "version": "0.7.5"
-        },
-        "sqlalchemy-migrate": {
-            "version": "0.7.2"
-        },
-        #the base is 2.0, need to upgrade
-        "pycrypto": {
-            "version": "2.5",
-            "options": "--upgrade"
-        },
-        "py-bcrypt": {
-            "version": "0.2"
-        },
-        "Routes": {
-            "version": "1.12.3"
-        },
-        #the newest we can get is 1.3.3 from epel/rhel
-        #this causes issues like the following
-        #https://answers.launchpad.net/nova/+question/174160
-        #https://answers.launchpad.net/nova/+question/185116
-        "PasteDeploy": {
-            "version": "1.5"
-        },
-        "PasteScript": {
-            "version": "1.7.5"
-        },
-        "Paste": {
-            "version": "1.7.5.1"
-        }
-    }
-}
diff --git a/conf/pips/n-vnc.json b/conf/pips/n-vnc.json
deleted file mode 100644
index 4b066e3f..00000000
--- a/conf/pips/n-vnc.json
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "rhel-6": {
-        "numpy": {
-            "version": "1.5"
-        }
-    }
-}
diff --git a/conf/pips/nova.json b/conf/pips/nova.json
deleted file mode 100644
index 30d9446f..00000000
--- a/conf/pips/nova.json
+++ /dev/null
@@ -1,41 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "rhel-6": {
-        "SQLAlchemy": {
-            "version": "0.7.5"
-        },
-        #the base is 0.4, need to upgrade (?)
-        "Tempita": {
-            "version": "0.5dev",
-            "options": "--upgrade"
-        },
-        "sqlalchemy-migrate": {
-            "version": "0.7.2"
-        },
-        #the base is 2.0, need to upgrade
-        "pycrypto": {
-            "version": "2.5",
-            "options": "--upgrade"
-        },
-        "Routes": {
-            "version": "1.12.3"
-        },
-        #the newest we can get is 1.3.3 from epel/rhel
-        #this causes issues like the following
-        #https://answers.launchpad.net/nova/+question/174160
-        #https://answers.launchpad.net/nova/+question/185116
-        "PasteDeploy": {
-            "version": "1.5"
-        },
-        "PasteScript": {
-            "version": "1.7.5"
-        },
-        "Paste": {
-            "version": "1.7.5.1"
-        },
-        "iso8601": {
-            "version": "0.1.4"
-        }
-    }
-}
diff --git a/conf/pips/quantum.json b/conf/pips/quantum.json
deleted file mode 100644
index 8480decb..00000000
--- a/conf/pips/quantum.json
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    "rhel-6": {
-        "SQLAlchemy": {
-            "version": "0.7.5"
-        },
-        "sqlalchemy-migrate": {
-            "version": "0.7.2"
-        },
-        #the newest we can get is 1.3.3 from epel/rhel
-        #this causes issues like the following
-        #https://answers.launchpad.net/nova/+question/174160
-        #https://answers.launchpad.net/nova/+question/185116
-        "PasteDeploy": {
-            "version": "1.5"
-        },
-        "PasteScript": {
-            "version": "1.7.5"
-        },
-        "Paste": {
-            "version": "1.7.5.1"
-        },
-        "Routes": {
-            "version": "1.12.3"
-        }
-    }
-}
diff --git a/conf/pkgs/db.json b/conf/pkgs/db.json
deleted file mode 100644
index dad7613c..00000000
--- a/conf/pkgs/db.json
+++ /dev/null
@@ -1,59 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "ubuntu-oneiric": {
-        "mysql-client-5.1": {
-            "version": "5.1*",
-            "removable": true
-        },
-        "mysql-server-core-5.1": {
-            "version": "5.1*",
-            "removable": true
-        },
-        "mysql-common": {
-            "version": "5.1*",
-            "removable": true
-        },
-        "mysql-server-5.1": {
-            "version": "5.1*",
-            "removable": true,
-            "pre-install": [
-                {
-                    # This apparently is a action needed for ubuntu/debian to set the password to something known....
-                    "run_as_root": true,
-                    "cmd": [
-                        "debconf-set-selections"
-                    ],
-                    "stdin": [
-                        "mysql-server-5.1 mysql-server/root_password password %PASSWORD%",
-                        "mysql-server-5.1 mysql-server/root_password_again password %PASSWORD%",
-                        "mysql-server-5.1 mysql-server/start_on_boot boolean %BOOT_START%"
-                    ]
-                }
-            ]
-        }
-    },
-    "rhel-6": {
-        "mysql-server": {
-            "version": "5.1*",
-            "removable": true
-        },
-        "mysql": {
-            "version": "5.1*",
-            "removable": true
-        }
-    },
-    "fedora-16": {
-        "mysql-server": {
-            "version": "5.5*",
-            "removable": true
-        },
-        "mysql": {
-            "version": "5.5*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/general.json b/conf/pkgs/general.json
deleted file mode 100644
index e4d660bb..00000000
--- a/conf/pkgs/general.json
+++ /dev/null
@@ -1,255 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "curl": {
-            "removable": false, 
-            "version": "7.19.7*"
-        }, 
-        "euca2ools": {
-            "removable": false, 
-            "version": "1.3.1*",
-            "meta": {
-                "epel" : true
-            }
-        }, 
-        "git": {
-            "removable": false, 
-            "version": "1.7*"
-        }, 
-        "gawk": {
-            "version": "3.1*",
-            "removable": false
-        },
-        "iputils": {
-            "removable": false, 
-            "version": "20071127*"
-        }, 
-        "mlocate": {
-            "removable": false, 
-            "version": "0.22*"
-        }, 
-        "lsof": {
-            "removable": false, 
-            "version": "4.82*"
-        }, 
-        "openssh-server": {
-            "removable": false, 
-            "version": "5.3*"
-        }, 
-        "python-pep8": {
-            "removable": false, 
-            "version": "0.6*",
-            "meta": {
-                "epel" : true
-            }
-        }, 
-        "psmisc": {
-            "removable": false, 
-            "version": "22.6*"
-        }, 
-        "pylint": {
-            "removable": false, 
-            "version": "0.21*",
-            "meta": {
-                "epel" : true
-            }
-        }, 
-        "python": {
-            "removable": false, 
-            "version": "2.6*"
-        }, 
-        "python-pip": {
-            "removable": false, 
-            "version": "0.8*",
-            "meta": {
-                "epel" : true
-            }
-        }, 
-        "python-unittest2": {
-            "removable": false, 
-            "version": "0.5.1*",
-            "meta": {
-                "epel" : true
-            }
-        }, 
-        "python-virtualenv": {
-            "removable": false, 
-            "version": "1.7*",
-            "meta": {
-                "epel" : true
-            }
-        }, 
-        "python-setuptools": {
-            "version": "0.6.10*",
-            "removable": false
-        },
-        "python-distutils-extra": {
-            "version": "2.29*",
-            "removable": false,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-devel": {
-            "version": "2.6*",
-            "removable": false
-        },
-        "python-mox": {
-            "version": "0.5.3*",
-            "removable": false,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "screen": {
-            "removable": false, 
-            "version": "4.0.3*"
-        }, 
-        "sudo": {
-            "removable": false,
-            "version" : "1.7.4*"
-        },
-        "tcpdump": {
-            "removable": false, 
-            "version": "4.0*"
-        }, 
-        "unzip": {
-            "removable": false, 
-            "version": "6.0*"
-        }, 
-        "wget": {
-            "removable": false, 
-            "version": "1.12*"
-        },
-        "libxml2-devel": {
-            "removable": false,
-            "version": "2.7*"
-        },
-        "libxslt-devel": {
-            "removable": false,
-            "version": "1.1.26*"
-        },
-        "coreutils": {
-            "removable": false,
-            "version": "8.4*"
-        }
-    },
-    "fedora-16": {
-        "curl": {
-            "removable": false, 
-            "version": "7.21.7*"
-        }, 
-        "euca2ools": {
-            "removable": false, 
-            "version": "1.3.1*"
-        }, 
-        "git": {
-            "removable": false, 
-            "version": "1.7*"
-        }, 
-        "gawk": {
-            "version": "4.0*",
-            "removable": false
-        },
-        "iputils": {
-            "removable": false, 
-            "version": "20101006*"
-        }, 
-        "mlocate": {
-            "removable": false, 
-            "version": "0.24*"
-        }, 
-        "lsof": {
-            "removable": false, 
-            "version": "4.84*"
-        }, 
-        "openssh-server": {
-            "removable": false, 
-            "version": "5.8*"
-        }, 
-        "python-pep8": {
-            "removable": false, 
-            "version": "0.6*"
-        }, 
-        "psmisc": {
-            "removable": false, 
-            "version": "22.13*"
-        }, 
-        "pylint": {
-            "removable": false, 
-            "version": "0.24*"
-        }, 
-        "python": {
-            "removable": false, 
-            "version": "2.7*"
-        }, 
-        "python-coverage": {
-            "removable": false, 
-            "version": "3.5*"
-        }, 
-        "python-pip": {
-            "removable": false, 
-            "version": "0.8*"
-        }, 
-        "python-unittest2": {
-            "removable": false, 
-            "version": "0.5.1*"
-        }, 
-        "python-virtualenv": {
-            "removable": false, 
-            "version": "1.7*"
-        }, 
-        "python-setuptools": {
-            "version": "0.6.24*",
-            "removable": false
-        },
-        "python-distutils-extra": {
-            "version": "2.29*",
-            "removable": false
-        },
-        "python-devel": {
-            "version": "2.7*",
-            "removable": false
-        },
-        "python-nose": {
-            "version": "1.1*",
-            "removable": false
-        },
-        "python-mox": {
-            "version": "0.5.3*",
-            "removable": false
-        },
-        "screen": {
-            "removable": false, 
-            "version": "4.1.0*"
-        }, 
-        "sudo": {
-            "removable": false,
-            "version" : "1.8.3*"
-        },
-        "tcpdump": {
-            "removable": false, 
-            "version": "4.1*"
-        }, 
-        "unzip": {
-            "removable": false, 
-            "version": "6.0*"
-        }, 
-        "wget": {
-            "removable": false, 
-            "version": "1.12*"
-        },
-        "libxml2-devel": {
-            "removable": false,
-            "version": "2.7*"
-        },
-        "libxslt-devel": {
-            "removable": false,
-            "version": "1.1.26*"
-        }
-    }
-}
diff --git a/conf/pkgs/glance.json b/conf/pkgs/glance.json
deleted file mode 100644
index 7063fa71..00000000
--- a/conf/pkgs/glance.json
+++ /dev/null
@@ -1,97 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-greenlet": {
-            "version": "0.3.1*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-argparse": {
-            "version": "1.2*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "MySQL-python": {
-            "version": "1.2*",
-            "removable": true
-        },
-        "python-dateutil": {
-            "version": "1.4*",
-            "removable": true
-        },
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "pyxattr": {
-            "version": "0.5*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-httplib2": {
-            "version": "0.4*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        }
-    },
-    "fedora-16": {
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "python-routes": {
-            "version": "1.12*",
-            "removable": true
-        },
-        "python-greenlet": {
-            "version": "0.3.1*",
-            "removable": true
-        },
-        "python-argparse": {
-            "version": "1.1*",
-            "removable": true
-        },
-        "MySQL-python": {
-            "version": "1.2*",
-            "removable": true
-        },
-        "python-dateutil": {
-            "version": "1.5*",
-            "removable": true
-        },
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true
-        },
-        "pyxattr": {
-            "version": "0.5*",
-            "removable": true
-        },
-        "python-httplib2": {
-            "version": "0.6*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/horizon.json b/conf/pkgs/horizon.json
deleted file mode 100644
index 551ad2e9..00000000
--- a/conf/pkgs/horizon.json
+++ /dev/null
@@ -1,124 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "httpd": {
-            "version": "2.2*",
-            "removable": true
-        },
-        "mod_wsgi": {
-            "version": "3.2*",
-            "removable": true
-        },
-        "python-dateutil": {
-            "version": "1.4*",
-            "removable": true
-        },
-        "python-webob1.0": {
-            "version": "1.0*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-kombu": {
-            "version": "1.1*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        }
-    },
-    # initially stolen from ubuntu-oneric
-    "fedora-16": {
-        "httpd": {
-            "version": "2.2*",
-            "removable": true
-        },
-        "mod_wsgi": {
-            "version": "3.3*",
-            "removable": true
-        },
-        "python-dateutil": {
-            "version": "1.5*",
-            "removable": true
-        },
-        "python-paste": {
-            "version": "1.7.5*",
-            "removable": true
-        },
-        "python-paste-deploy": {
-            "version": "1.5.0*",
-            "removable": true
-        },
-        "python-routes": {
-            "version": "1.12*",
-            "removable": true
-        },
-        "pyxattr": {
-            "version": "0.5*",
-            "removable": true
-        },
-        "python-sqlalchemy": {
-            "version": "0.7*",
-            "removable": true
-        },
-        "python-webob": {
-            "version": "1.0*",
-            "removable": true
-        },
-        "python-kombu": {
-            "version": "1.1*",
-            "removable": true
-        },
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "python-sphinx": {
-            "version": "1.0.7*",
-            "removable": true
-        },
-        "python-cherrypy": {
-            "version": "3.2*",
-            "removable": true
-        },
-        "Django": {
-            "version": "1.3*",
-            "removable": true
-        },
-         # Not packaged yet
-#        "python-django-mailer": {
-#            "version": "0.2*",
-#            "removable": true
-#        },
-        # Is this really needed?
-        # Only in F16 testing repo
-#        "python-django-nose": {
-#            "version": "0.1*",
-#            "removable": true
-#        },
-        "django-registration": {
-            "version": "0.7*",
-            "removable": true
-        },
-        "python-cloudfiles": {
-            "version": "1.7.9*",
-            "removable": true
-        },
-        "python-migrate": {
-            "version": "0.7*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/keystone-client.json b/conf/pkgs/keystone-client.json
deleted file mode 100644
index b60dc043..00000000
--- a/conf/pkgs/keystone-client.json
+++ /dev/null
@@ -1,33 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "python-argparse": {
-            "version": "1.2*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        }
-    },
-    "fedora-16": {
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true
-        },
-        "python-argparse": {
-            "version": "1.1*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/keystone.json b/conf/pkgs/keystone.json
deleted file mode 100644
index 9f1e14f4..00000000
--- a/conf/pkgs/keystone.json
+++ /dev/null
@@ -1,165 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-lxml": {
-            # Trashes IPA client, which is probably bad
-            "version": "2.2*",
-            "removable": true
-        },
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "MySQL-python": {
-            "version": "1.2*",
-            "removable": true
-        },
-        "sqlite": {
-            "version": "3.6*",
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "removable": false
-        },
-        "python-sqlite2": {
-            "version": "2.3*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-webob1.0": {
-            "version": "1.0*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-argparse": {
-            "version": "1.2*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-greenlet": {
-            "version": "0.3.1*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-passlib": {
-            "version": "1.5*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "openldap": {
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "removable": false,
-            "version": "2.4*"
-        },
-        "openldap-devel": {
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "removable": true,
-            "version": "2.4*"
-        },
-        "cyrus-sasl-lib": {
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "version": "2.1*",
-            "removable": false
-        }
-    },
-    "fedora-16": {
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "python-lxml": {
-            # Trashes IPA client, which is probably bad
-            "version": "2.3*",
-            "removable": true
-        },
-        "python-paste-script": {
-            "version": "1.7*",
-            "removable": true
-        },
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true
-        },
-        "MySQL-python": {
-            "version": "1.2*",
-            "removable": true
-        },
-        "python-migrate": {
-            "version": "0.7*",
-            "removable": true
-        },
-        "python-paste-deploy": {
-            "version": "1.5*",
-            "removable": true
-        },
-        "python-paste": {
-            "version": "1.7.5*",
-            "removable": true
-        },
-        "sqlite": {
-            "version": "3.7*",
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "removable": false
-        },
-        "python-sqlite2": {
-            "version": "2.3*",
-            "removable": true
-        },
-        "python-sqlalchemy": {
-            "version": "0.7*",
-            "removable": true
-        },
-        "python-webob": {
-            "version": "1.0*",
-            "removable": true
-        },
-        "python-argparse": {
-            "version": "1.1*",
-            "removable": true
-        },
-        "python-greenlet": {
-            "version": "0.3.1*",
-            "removable": true
-        },
-        "python-routes": {
-            "version": "1.12*",
-            "removable": true
-        },
-        "python-passlib": {
-            "version": "1.5*",
-            "removable": true
-        },
-        "openldap": {
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "removable": false,
-            "version": "2.4*"
-        },
-        "cyrus-sasl-lib": {
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "version": "2.1*",
-            "removable": false
-        }
-    }
-}
diff --git a/conf/pkgs/melange.json b/conf/pkgs/melange.json
deleted file mode 100644
index 6f41676d..00000000
--- a/conf/pkgs/melange.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)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        # TBD
-    }
-}
diff --git a/conf/pkgs/n-api.json b/conf/pkgs/n-api.json
deleted file mode 100644
index 8626cac1..00000000
--- a/conf/pkgs/n-api.json
+++ /dev/null
@@ -1,19 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "python-dateutil": {
-            "version": "1.4*",
-            "removable": false
-        }
-    },
-    "fedora-16": {
-        "python-dateutil": {
-            "version": "1.5*",
-            "removable": false
-        }
-    }
-}
diff --git a/conf/pkgs/n-cpu.json b/conf/pkgs/n-cpu.json
deleted file mode 100644
index 4597985f..00000000
--- a/conf/pkgs/n-cpu.json
+++ /dev/null
@@ -1,80 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "lvm2": {
-            "version": "2.02*",
-            "removable": true
-        },
-        "iscsi-initiator-utils": {
-            "version": "6.2*",
-            "removable": true
-        },
-        # Only really needed if you plan on using kvm
-        "qemu-kvm":  {
-            "version": "2*",
-            "removable": true
-        },
-        "qemu-img":  {
-            "version": "0.12*",
-            "removable": true
-        },
-        "libvirt-python": {
-            "version": "0.9.4*",
-            "removable": true
-        },
-        "libvirt-client": {
-            "version": "0.9.4*",
-            "removable": true
-        },
-        "libvirt": {
-            "version": "0.9.4*",
-            "removable": true
-        },
-        "libguestfs": {
-            "version": "1.2.7*",
-            "removable": true
-        },
-        "libguestfs-mount": {
-            "version": "1.7.17*",
-            "removable": true
-        },
-        "libguestfs-tools": {
-            "version": "1.7.17*",
-            "removable": true
-        }
-    },
-    "fedora-16": {
-        "lvm2": {
-            "version": "2.02*",
-            "removable": true
-        },
-        "iscsi-initiator-utils": {
-            "version": "6.2*",
-            "removable": true
-        },
-        "qemu-system-x86": {
-            "version": "0.15*",
-            "removable": true
-        },
-        "qemu-img":  {
-            "version": "0.15*",
-            "removable": true
-        },
-        "libvirt-python": {
-            "version": "0.9.6*",
-            "removable": true
-        },
-        "libvirt-client": {
-            "version": "0.9.6*",
-            "removable": true
-        },
-        "libvirt": {
-            "version": "0.9.6*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/n-vnc.json b/conf/pkgs/n-vnc.json
deleted file mode 100644
index 07d2dc36..00000000
--- a/conf/pkgs/n-vnc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-    },
-    "fedora-16": {
-        "numpy": {
-            "version": "1.6*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/n-vol.json b/conf/pkgs/n-vol.json
deleted file mode 100644
index b0281c73..00000000
--- a/conf/pkgs/n-vol.json
+++ /dev/null
@@ -1,35 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "lvm2": {
-            "version": "2.02*",
-            "removable": true
-        },
-        "scsi-target-utils": {
-            "version": "1.0*",
-            "removable": true
-        },
-        "iscsi-initiator-utils": {
-            "version": "6.2*",
-            "removable": true
-        }
-    },
-    "fedora-16": {
-        "lvm2": {
-            "version": "2.02*",
-            "removable": true
-        },
-        "scsi-target-utils": {
-            "version": "1.0*",
-            "removable": true
-        },
-        "iscsi-initiator-utils": {
-            "version": "6.2*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/nova-client.json b/conf/pkgs/nova-client.json
deleted file mode 100644
index 0b19229c..00000000
--- a/conf/pkgs/nova-client.json
+++ /dev/null
@@ -1,33 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "python-argparse": {
-            "version": "1.2*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        }
-    },
-    "fedora-16": {
-        "python-argparse": {
-            "version": "1.1*",
-            "removable": true
-        },
-        "python-prettytable": {
-            "version": "0.5*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/nova.json b/conf/pkgs/nova.json
deleted file mode 100644
index e254eb5e..00000000
--- a/conf/pkgs/nova.json
+++ /dev/null
@@ -1,264 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        # For dhcp_release
-        "dnsmasq": {
-            "version": "2.48*",
-            "removable": false
-        },
-        "kpartx": {
-            "version": "0.4*",
-            "removable": false
-        },
-        "parted": {
-            "version": "2.1*",
-            "removable": false
-        },
-        "iputils": {
-            "version": "20071127*",
-            "removable": false
-        },
-        "MySQL-python": {
-            "version": "1.2*",
-            "removable": true
-        },
-        # Needed for glance which is needed for nova --- this shouldn't be here
-        "pyxattr": {
-            "version": "0.5*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        # Needed for glance which is needed for nova --- this shouldn't be here
-        "python-lxml": {
-            "version": "2.2*",
-            "removable": true
-        },
-        "iptables": {
-            "version": "1.4*",
-            "removable": false
-        },
-        "ebtables": {
-            "version": "2.0*",
-            "removable": false
-        },
-        "sqlite": {
-            "version": "3.6*",
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "removable": false
-        },
-        # ???
-        # "vlan": {
-        #     "version": "1.9*",
-        #     "removable": true
-        # },
-        # Used by ajaxterm
-        "socat": {
-            "version": "1.7*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-gflags": {
-            "version": "1.4*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-greenlet": {
-            "version": "0.3.1*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        # This seems to kill RHN/yum if its removed ??
-        "libxml2-python": {
-            "version": "2.7*",
-            "removable": false
-        },
-        "python-netaddr": {
-            "version": "0.7*",
-            "removable": true
-        },
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-cheetah": {
-            "version": "2.4*",
-            "removable": true
-        },
-        "python-carrot": {
-            "version": "0.10*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-suds": {
-            "version": "0.4*",
-            "removable": true
-        },
-        "python-lockfile": {
-            "version": "0.8*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-crypto": {
-            "version": "2.0*",
-            "removable": false
-        },
-        "python-boto": {
-            "version": "2.0*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-kombu": {
-            "version": "1.1*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-feedparser": {
-            "version": "5.0*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        }
-    },
-    "fedora-16": {
-        # For dhcp_release
-        "dnsmasq": {
-            "version": "2.58*",
-            "removable": false
-        },
-        "kpartx": {
-            "version": "0.4*",
-            "removable": false
-        },
-        "parted": {
-            "version": "3.0*",
-            "removable": false
-        },
-        "iputils": {
-            "version": "20101006*",
-            "removable": false
-        },
-        "MySQL-python": {
-            "version": "1.2*",
-            "removable": true
-        },
-        # Needed for glance which is needed for nova --- this shouldn't be here
-        "pyxattr": {
-            "version": "0.5*",
-            "removable": true
-        },
-        # Needed for glance which is needed for nova --- this shouldn't be here
-        "python-lxml": {
-            "version": "2.3*",
-            "removable": true
-        },
-        "iptables": {
-            "version": "1.4*",
-            "removable": false
-        },
-        "ebtables": {
-            "version": "2.0*",
-            "removable": false
-        },
-        "sqlite": {
-            "version": "3.7*",
-            # Trashes alot of the base os (so we don't allow it to be removed)
-            "removable": false
-        },
-        # ???
-        # "vconfig": {
-        #     "version": "1.9*",
-        #     "removable": true
-        # },
-        # Used by ajaxterm
-        "socat": {
-            "version": "1.7*",
-            "removable": true
-        },
-        "python-paste": {
-            "version": "1.7.5*",
-            "removable": true
-        },
-        "python-gflags": {
-            "version": "1.5*",
-            "removable": true
-        },
-        "python-greenlet": {
-            "version": "0.3.1*",
-            "removable": true
-        },
-        # This seems to kill RHN/yum if its removed ??
-        # TODO verify...libxml2-python dependencies do not include yum
-        "libxml2-python": {
-            "version": "2.7*",
-            "removable": false
-        },
-        "python-routes": {
-            "version": "1.12*",
-            "removable": true
-        },
-        "python-netaddr": {
-            "version": "0.7*",
-            "removable": true
-        },
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "python-cheetah": {
-            "version": "2.4*",
-            "removable": true
-        },
-        "python-carrot": {
-            "version": "0.10*",
-            "removable": true
-        },
-        "python-suds": {
-            "version": "0.4*",
-            "removable": true
-        },
-        "python-lockfile": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "python-crypto": {
-            "version": "2.3*",
-            "removable": false
-        },
-        "python-boto": {
-            "version": "2.0*",
-            "removable": true
-        },
-        "python-kombu": {
-            "version": "1.1*",
-            "removable": true
-        },
-        "python-feedparser": {
-            "version": "5.0*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/quantum-client.json b/conf/pkgs/quantum-client.json
deleted file mode 100644
index 69e4faea..00000000
--- a/conf/pkgs/quantum-client.json
+++ /dev/null
@@ -1,22 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "python-gflags": {
-            "version": "1.4*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        }
-    },
-    "fedora-16": {
-        "python-gflags": {
-            "version": "1.5*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/quantum-openvswitch.json b/conf/pkgs/quantum-openvswitch.json
deleted file mode 100644
index 2b4ac63a..00000000
--- a/conf/pkgs/quantum-openvswitch.json
+++ /dev/null
@@ -1,20 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-    },
-    "fedora-16": {
-        # Seems needed for ovs_quantum_agent.py
-        "python-sqlalchemy": {
-            "version": "0.7*",
-            "removable": true
-        },
-        "MySQL-python": {
-            "version": "1.2*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/quantum.json b/conf/pkgs/quantum.json
deleted file mode 100644
index 6dad95e8..00000000
--- a/conf/pkgs/quantum.json
+++ /dev/null
@@ -1,64 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "python-greenlet": {
-            "version": "0.3.1*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "python-gflags": {
-            "version": "1.4*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
-        "libxml2-python": {
-            "version": "2.7*",
-            "removable": false
-        }
-    },
-    "fedora-16": {
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "python-greenlet": {
-            "version": "0.3*",
-            "removable": true
-        },
-        "python-routes": {
-            "version": "1.12*",
-            "removable": true
-        },
-        "python-lxml": {
-            "version": "2.3*",
-            "removable": true
-        },
-        "python-paste": {
-            "version": "1.7*",
-            "removable": true
-        },
-        "python-gflags": {
-            "version": "1.5*",
-            "removable": true
-        },
-        "python-paste-deploy": {
-            "version": "1.5*",
-            "removable": true
-        }
-    }
-}
diff --git a/conf/pkgs/rabbitmq.json b/conf/pkgs/rabbitmq.json
deleted file mode 100644
index 42df919a..00000000
--- a/conf/pkgs/rabbitmq.json
+++ /dev/null
@@ -1,65 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        "rabbitmq-server": {
-            "version": "2.6*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            },
-            "pre-install": [
-                {
-                    # Qpidd runs on the same port
-                    "run_as_root": true,
-                    "ignore_failure": true,
-                    "cmd": [
-                        "service",
-                        "qpidd",
-                        "stop"
-                    ]
-                },
-                {
-                    # Qpidd runs on the same port
-                    "run_as_root": true,
-                    "ignore_failure": true,
-                    "cmd": [
-                        "chkconfig",
-                        "qpidd",
-                        "off"
-                    ]
-                }
-            ]
-        }
-    },
-    "fedora-16": {
-        "rabbitmq-server": {
-            "version": "2.6*",
-            "removable": true,
-            "pre-install": [
-                {
-                    # Qpidd runs on the same port
-                    "run_as_root": true,
-                    "cmd": [
-                        "service",
-                        "qpidd",
-                        "stop"
-                    ]
-                },
-                {
-                    # Qpidd runs on the same port
-                    "run_as_root": true,
-                    "ignore_failure": true,
-                    "cmd": [
-                        "chkconfig",
-                        "qpidd",
-                        "off"
-                    ]
-                }
-            ]
-        }
-    }
-}
diff --git a/conf/pkgs/swift.json b/conf/pkgs/swift.json
deleted file mode 100644
index a60091db..00000000
--- a/conf/pkgs/swift.json
+++ /dev/null
@@ -1,49 +0,0 @@
-# This is a extended json package definition file 
-# We allow simple comments (lines starting with a hash symbol)
-{
-    # This is currently our "master" repo set with versions
-    # that we are trying to align other distributions with.
-    # The versions should at least be major + minor!
-    "rhel-6": {
-        # TBD
-    },
-    "fedora-16": {
-        # installed for swift-keystone
-        "memcached": {
-            "version": "1.4*",
-            "removable": true
-        },
-        "python-configobj": {
-            "version": "4.7*",
-            "removable": true
-        },
-        "python-eventlet": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "python-greenlet": {
-            "version": "0.3*",
-            "removable": true
-        },
-        "python-netifaces": {
-            "version": "0.5*",
-            "removable": true
-        },
-        "python-paste-deploy": {
-            "version": "1.5*",
-            "removable": true
-        },
-        "python-webob": {
-            "version": "1.0*",
-            "removable": true
-        },
-        "pyxattr": {
-            "version": "0.5*",
-            "removable": true
-        },
-        "sqlite": {
-            "version": "3.7*",
-            "removable": true
-        }
-    }
-}