From 79402ffbaeae18bb4adaa899743a688ef0bcb24b Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Sun, 19 Jun 2011 18:00:38 -0400
Subject: [PATCH] Cleanup of the cleanup.

---
 bin/nova-api                                | 6 ++----
 nova/tests/integrated/integrated_helpers.py | 3 ---
 setup.cfg                                   | 3 ---
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bin/nova-api b/bin/nova-api
index ff4aa83d1292..1fcda24f4f7a 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
@@ -18,13 +19,10 @@
 
 """Starter script for Nova API.
 
-Starts both the EC2 and OpenStack APIs in separate processes. Pylint warnings
-about re-imports should be ignored.
+Starts both the EC2 and OpenStack APIs in separate processes.
 
 """
 
-# pylint: disable=W0404
-
 import sys
 import multiprocessing
 
diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index ba6bef62ff8b..8809bf5f8bf7 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -171,9 +171,6 @@ class _IntegratedTestBase(test.TestCase):
         self.api = self.user.openstack_api
 
     def _start_api_service(self):
-        #ec2 = service.WSGIService("ec2")
-        #ec2.start()
-
         osapi = service.WSGIService("osapi")
         osapi.start()
 
diff --git a/setup.cfg b/setup.cfg
index 7efc46f23d28..9c0a331e35e2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[develop]
-user = True
-
 [build_sphinx]
 all_files = 1
 build-dir = doc/build