diff --git a/glance/api/__init__.py b/glance/api/__init__.py
index 496cf05025..bd60c19e3f 100644
--- a/glance/api/__init__.py
+++ b/glance/api/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/cached_images.py b/glance/api/cached_images.py
index 75be9c623f..15d6b45a49 100644
--- a/glance/api/cached_images.py
+++ b/glance/api/cached_images.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py
index 2303eacd42..89ec8b5693 100644
--- a/glance/api/middleware/cache.py
+++ b/glance/api/middleware/cache.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/middleware/cache_manage.py b/glance/api/middleware/cache_manage.py
index 820cf7eed8..1697e1447b 100644
--- a/glance/api/middleware/cache_manage.py
+++ b/glance/api/middleware/cache_manage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/middleware/context.py b/glance/api/middleware/context.py
index 7734017117..ead1712c22 100644
--- a/glance/api/middleware/context.py
+++ b/glance/api/middleware/context.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/middleware/gzip.py b/glance/api/middleware/gzip.py
index 922800ef82..0072f4f7de 100644
--- a/glance/api/middleware/gzip.py
+++ b/glance/api/middleware/gzip.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/api/middleware/version_negotiation.py b/glance/api/middleware/version_negotiation.py
index 4becba6f2c..f8ef1d207d 100644
--- a/glance/api/middleware/version_negotiation.py
+++ b/glance/api/middleware/version_negotiation.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/policy.py b/glance/api/policy.py
index 9ee5238125..bc804d519f 100644
--- a/glance/api/policy.py
+++ b/glance/api/policy.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
diff --git a/glance/api/property_protections.py b/glance/api/property_protections.py
index 28a66d4b3d..9e6ca05392 100644
--- a/glance/api/property_protections.py
+++ b/glance/api/property_protections.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2013 Rackspace
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/glance/api/v1/__init__.py b/glance/api/v1/__init__.py
index 892e9c5278..74de9aa141 100644
--- a/glance/api/v1/__init__.py
+++ b/glance/api/v1/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/v1/controller.py b/glance/api/v1/controller.py
index b85f1084b1..244e446908 100644
--- a/glance/api/v1/controller.py
+++ b/glance/api/v1/controller.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/v1/filters.py b/glance/api/v1/filters.py
index 9212626a01..a71b13cc89 100644
--- a/glance/api/v1/filters.py
+++ b/glance/api/v1/filters.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012, Piston Cloud Computing, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py
index 94f2d31a8d..5cd7a116da 100644
--- a/glance/api/v1/images.py
+++ b/glance/api/v1/images.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/v1/members.py b/glance/api/v1/members.py
index 760e20cda4..e3bc32b794 100644
--- a/glance/api/v1/members.py
+++ b/glance/api/v1/members.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # Copyright 2013 NTT corp.
 # All Rights Reserved.
diff --git a/glance/api/v1/router.py b/glance/api/v1/router.py
index 43aecc95a8..85a27dc78d 100644
--- a/glance/api/v1/router.py
+++ b/glance/api/v1/router.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py
index 8754888b76..b6ad8e0ca7 100644
--- a/glance/api/v1/upload_utils.py
+++ b/glance/api/v1/upload_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/api/v2/router.py b/glance/api/v2/router.py
index f60911e399..5df3a6a6bc 100644
--- a/glance/api/v2/router.py
+++ b/glance/api/v2/router.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py
index c66ddc6516..f5d634dae1 100644
--- a/glance/api/v2/tasks.py
+++ b/glance/api/v2/tasks.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
 #
diff --git a/glance/api/versions.py b/glance/api/versions.py
index 23cc7610d0..82df911424 100644
--- a/glance/api/versions.py
+++ b/glance/api/versions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/glance/cmd/__init__.py b/glance/cmd/__init__.py
index 44245269f6..b460b6d12f 100644
--- a/glance/cmd/__init__.py
+++ b/glance/cmd/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/cmd/api.py b/glance/cmd/api.py
index 76a82abe98..94753350f6 100755
--- a/glance/cmd/api.py
+++ b/glance/cmd/api.py
@@ -1,5 +1,4 @@
 #!/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.
diff --git a/glance/cmd/cache_cleaner.py b/glance/cmd/cache_cleaner.py
index e0535160cb..42a5c84494 100644
--- a/glance/cmd/cache_cleaner.py
+++ b/glance/cmd/cache_cleaner.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # Copyright 2011 OpenStack Foundation
diff --git a/glance/cmd/cache_manage.py b/glance/cmd/cache_manage.py
index 4aab894f70..5e604b1e33 100755
--- a/glance/cmd/cache_manage.py
+++ b/glance/cmd/cache_manage.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/glance/cmd/cache_prefetcher.py b/glance/cmd/cache_prefetcher.py
index 2d46597dc5..0a2c6acbb0 100755
--- a/glance/cmd/cache_prefetcher.py
+++ b/glance/cmd/cache_prefetcher.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
diff --git a/glance/cmd/cache_pruner.py b/glance/cmd/cache_pruner.py
index 318c196813..da543dbdf4 100644
--- a/glance/cmd/cache_pruner.py
+++ b/glance/cmd/cache_pruner.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # Copyright 2011 OpenStack Foundation
diff --git a/glance/cmd/control.py b/glance/cmd/control.py
index 60a7707b9b..2cc69dc46c 100644
--- a/glance/cmd/control.py
+++ b/glance/cmd/control.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py
index 2e5c220524..08a6430115 100755
--- a/glance/cmd/manage.py
+++ b/glance/cmd/manage.py
@@ -1,5 +1,4 @@
 #!/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.
diff --git a/glance/cmd/registry.py b/glance/cmd/registry.py
index a3d472e083..23623a8c6a 100755
--- a/glance/cmd/registry.py
+++ b/glance/cmd/registry.py
@@ -1,5 +1,4 @@
 #!/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.
diff --git a/glance/cmd/replicator.py b/glance/cmd/replicator.py
index 96e51c67f2..647837c4e7 100755
--- a/glance/cmd/replicator.py
+++ b/glance/cmd/replicator.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2012 Michael Still and Canonical Inc
 # All Rights Reserved.
diff --git a/glance/cmd/scrubber.py b/glance/cmd/scrubber.py
index c010f92010..8e2474eea1 100755
--- a/glance/cmd/scrubber.py
+++ b/glance/cmd/scrubber.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
diff --git a/glance/common/auth.py b/glance/common/auth.py
index 1d1f4c58de..ce4baef7e1 100644
--- a/glance/common/auth.py
+++ b/glance/common/auth.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/common/client.py b/glance/common/client.py
index 3d4c1bda31..8b9644a579 100644
--- a/glance/common/client.py
+++ b/glance/common/client.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/common/config.py b/glance/common/config.py
index 6fc095155b..3177b073d0 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
index ee505442c7..f719d11806 100644
--- a/glance/common/crypt.py
+++ b/glance/common/crypt.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/glance/common/exception.py b/glance/common/exception.py
index ff745c606b..eaedc75b0b 100644
--- a/glance/common/exception.py
+++ b/glance/common/exception.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
diff --git a/glance/common/property_utils.py b/glance/common/property_utils.py
index 8a86aa966d..6384edff56 100644
--- a/glance/common/property_utils.py
+++ b/glance/common/property_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2013 Rackspace
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/glance/common/rpc.py b/glance/common/rpc.py
index 13f99d351f..ee5f25801b 100644
--- a/glance/common/rpc.py
+++ b/glance/common/rpc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/common/utils.py b/glance/common/utils.py
index c0d653a95f..51dc55b1ba 100644
--- a/glance/common/utils.py
+++ b/glance/common/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index 0df6c876ca..c9c3f0fd85 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # Copyright 2010 OpenStack Foundation
diff --git a/glance/context.py b/glance/context.py
index 60cf55fb12..89ca3c1818 100644
--- a/glance/context.py
+++ b/glance/context.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/__init__.py b/glance/db/__init__.py
index d7d9940e89..63230cade0 100644
--- a/glance/db/__init__.py
+++ b/glance/db/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # Copyright 2010-2012 OpenStack Foundation
diff --git a/glance/db/migration.py b/glance/db/migration.py
index 1c9ce3f169..25e0c492ad 100644
--- a/glance/db/migration.py
+++ b/glance/db/migration.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
diff --git a/glance/db/registry/api.py b/glance/db/registry/api.py
index 3198fcad11..914ba74802 100644
--- a/glance/db/registry/api.py
+++ b/glance/db/registry/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py
index 3e457d6bc8..012b086f6f 100644
--- a/glance/db/sqlalchemy/api.py
+++ b/glance/db/sqlalchemy/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # Copyright 2010-2011 OpenStack Foundation
diff --git a/glance/db/sqlalchemy/migrate_repo/schema.py b/glance/db/sqlalchemy/migrate_repo/schema.py
index b941c3dbab..4fc84e749b 100644
--- a/glance/db/sqlalchemy/migrate_repo/schema.py
+++ b/glance/db/sqlalchemy/migrate_repo/schema.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py b/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py
index 1e7df3078b..6d2f46cb90 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/002_add_image_properties_table.py b/glance/db/sqlalchemy/migrate_repo/versions/002_add_image_properties_table.py
index 370b09cdca..e2a8b34ae5 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/002_add_image_properties_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/002_add_image_properties_table.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py b/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
index 0499514821..cbd3a9375d 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py b/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
index e0612dec6c..f68343dc11 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py b/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
index d751b75b43..782c182ddd 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py b/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
index 52637fce3e..0957bb6779 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py b/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
index dcd8287597..6d4d7b1f18 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py b/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
index f919b04944..491cd4f7f4 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py b/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
index 559f5d5756..d8250a944b 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py b/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
index 1ae09a6e64..6d6d43bb2b 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/011_make_mindisk_and_minram_notnull.py b/glance/db/sqlalchemy/migrate_repo/versions/011_make_mindisk_and_minram_notnull.py
index 21e0a12d63..fe7b017900 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/011_make_mindisk_and_minram_notnull.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/011_make_mindisk_and_minram_notnull.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py b/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py
index c95c57f9f4..b506b0ad9a 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py b/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py
index adc68b50e0..09219e6eb3 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
index 0a58c9e912..5e62004f25 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/016_add_status_image_member.py b/glance/db/sqlalchemy/migrate_repo/versions/016_add_status_image_member.py
index 3d6e914672..2998df1c90 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/016_add_status_image_member.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/016_add_status_image_member.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
index a0041aa811..c60bf300a7 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/018_add_image_locations_table.py b/glance/db/sqlalchemy/migrate_repo/versions/018_add_image_locations_table.py
index a4978c841d..782a6208ae 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/018_add_image_locations_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/018_add_image_locations_table.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py b/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py
index adf2b75db0..adf853f946 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/020_drop_images_table_location.py b/glance/db/sqlalchemy/migrate_repo/versions/020_drop_images_table_location.py
index ace08a5ad0..392af57a32 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/020_drop_images_table_location.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/020_drop_images_table_location.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/021_set_engine_mysql_innodb.py b/glance/db/sqlalchemy/migrate_repo/versions/021_set_engine_mysql_innodb.py
index 7d341251ea..12a0b68b09 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/021_set_engine_mysql_innodb.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/021_set_engine_mysql_innodb.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 # Copyright 2013 IBM Corp.
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py b/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py
index 51fcf1369d..833e67275c 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py b/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py
index bf942094cc..5c63682a9d 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py b/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py
index bf942094cc..5c63682a9d 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py b/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py
index bf942094cc..5c63682a9d 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py b/glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py
index cea0026ede..05970fc2c6 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py b/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py
index 7f40bee1c0..b74746c0d9 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py b/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py
index 1bd51a57b3..73815fa5d4 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py b/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
index 3ac85f89d8..a1b5e2b12e 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py b/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py
index 0a728de01d..f02521ee60 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 # Copyright 2013 IBM Corp.
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py b/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py
index e48492d38c..b38619f8f2 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py b/glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py
index 860539803e..b18c58db57 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/migration.py b/glance/db/sqlalchemy/migration.py
index 5cc09f8bca..224b0bd8a8 100644
--- a/glance/db/sqlalchemy/migration.py
+++ b/glance/db/sqlalchemy/migration.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/db/sqlalchemy/models.py b/glance/db/sqlalchemy/models.py
index 5a28266a1c..1d4823b25f 100644
--- a/glance/db/sqlalchemy/models.py
+++ b/glance/db/sqlalchemy/models.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
diff --git a/glance/image_cache/__init__.py b/glance/image_cache/__init__.py
index 9a2fc7dbe1..d59931adc4 100644
--- a/glance/image_cache/__init__.py
+++ b/glance/image_cache/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/image_cache/base.py b/glance/image_cache/base.py
index eb8832cb0e..e26b49defd 100644
--- a/glance/image_cache/base.py
+++ b/glance/image_cache/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/glance/image_cache/cleaner.py b/glance/image_cache/cleaner.py
index bf6b86f9e1..33ca26d130 100644
--- a/glance/image_cache/cleaner.py
+++ b/glance/image_cache/cleaner.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/image_cache/drivers/base.py b/glance/image_cache/drivers/base.py
index 9d489be7b8..9d72c6f49d 100644
--- a/glance/image_cache/drivers/base.py
+++ b/glance/image_cache/drivers/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/image_cache/drivers/sqlite.py b/glance/image_cache/drivers/sqlite.py
index 5e8eed982a..54929ca2d2 100644
--- a/glance/image_cache/drivers/sqlite.py
+++ b/glance/image_cache/drivers/sqlite.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/image_cache/drivers/xattr.py b/glance/image_cache/drivers/xattr.py
index 448403a6e2..dd8888343f 100644
--- a/glance/image_cache/drivers/xattr.py
+++ b/glance/image_cache/drivers/xattr.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/image_cache/prefetcher.py b/glance/image_cache/prefetcher.py
index 0dfad7dd14..57c36e9fb1 100644
--- a/glance/image_cache/prefetcher.py
+++ b/glance/image_cache/prefetcher.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/image_cache/pruner.py b/glance/image_cache/pruner.py
index 141e8a8ff0..c5d106a535 100644
--- a/glance/image_cache/pruner.py
+++ b/glance/image_cache/pruner.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/notifier.py b/glance/notifier.py
index 7c68619e18..9a95e22a5b 100644
--- a/glance/notifier.py
+++ b/glance/notifier.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011, OpenStack Foundation
 # Copyright 2012, Red Hat, Inc.
 # Copyright 2013 IBM Corp.
diff --git a/glance/quota/__init__.py b/glance/quota/__init__.py
index 459a1c4d92..6f3b7eb217 100644
--- a/glance/quota/__init__.py
+++ b/glance/quota/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013, Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py
index 1293dbf64b..ed51e08be8 100644
--- a/glance/registry/__init__.py
+++ b/glance/registry/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/registry/api/v1/__init__.py b/glance/registry/api/v1/__init__.py
index 0d121649d6..496a3d92c4 100644
--- a/glance/registry/api/v1/__init__.py
+++ b/glance/registry/api/v1/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/registry/api/v1/images.py b/glance/registry/api/v1/images.py
index 5829a87775..25d5e6dbf4 100644
--- a/glance/registry/api/v1/images.py
+++ b/glance/registry/api/v1/images.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/registry/api/v1/members.py b/glance/registry/api/v1/members.py
index a2c4e35aa7..22e88f52f7 100644
--- a/glance/registry/api/v1/members.py
+++ b/glance/registry/api/v1/members.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/registry/api/v2/__init__.py b/glance/registry/api/v2/__init__.py
index 754ec5eca5..7070334247 100644
--- a/glance/registry/api/v2/__init__.py
+++ b/glance/registry/api/v2/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/registry/api/v2/rpc.py b/glance/registry/api/v2/rpc.py
index 436ad803fe..faa6b55f7e 100644
--- a/glance/registry/api/v2/rpc.py
+++ b/glance/registry/api/v2/rpc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/registry/client/__init__.py b/glance/registry/client/__init__.py
index 3d56b7545d..abc91a754e 100644
--- a/glance/registry/client/__init__.py
+++ b/glance/registry/client/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/registry/client/v1/api.py b/glance/registry/client/v1/api.py
index a6e50e396a..2be5dbb35d 100644
--- a/glance/registry/client/v1/api.py
+++ b/glance/registry/client/v1/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/registry/client/v1/client.py b/glance/registry/client/v1/client.py
index 80bb9609b8..b5f8eca5e9 100644
--- a/glance/registry/client/v1/client.py
+++ b/glance/registry/client/v1/client.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/registry/client/v2/api.py b/glance/registry/client/v2/api.py
index 388a0d2b17..e5f3a6b8eb 100644
--- a/glance/registry/client/v2/api.py
+++ b/glance/registry/client/v2/api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc
 # All Rights Reserved.
 #
diff --git a/glance/registry/client/v2/client.py b/glance/registry/client/v2/client.py
index 51c778432a..01467ba3ad 100644
--- a/glance/registry/client/v2/client.py
+++ b/glance/registry/client/v2/client.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/store/__init__.py b/glance/store/__init__.py
index c05b936d4c..4872bad557 100644
--- a/glance/store/__init__.py
+++ b/glance/store/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/store/base.py b/glance/store/base.py
index 5df628c18a..f0f89cbc42 100644
--- a/glance/store/base.py
+++ b/glance/store/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2012 RedHat Inc.
 # All Rights Reserved.
diff --git a/glance/store/cinder.py b/glance/store/cinder.py
index 9c29beae0c..a75d5b7778 100644
--- a/glance/store/cinder.py
+++ b/glance/store/cinder.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
 #    a copy of the License at
diff --git a/glance/store/filesystem.py b/glance/store/filesystem.py
index 8ecc851da6..dd9d8bac51 100644
--- a/glance/store/filesystem.py
+++ b/glance/store/filesystem.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/store/gridfs.py b/glance/store/gridfs.py
index ed92c7a58d..14f0b5fa7e 100644
--- a/glance/store/gridfs.py
+++ b/glance/store/gridfs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc
 # All Rights Reserved.
 #
diff --git a/glance/store/http.py b/glance/store/http.py
index 055c47477d..4df03adf10 100644
--- a/glance/store/http.py
+++ b/glance/store/http.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/store/location.py b/glance/store/location.py
index c010e1ef97..6fe965a1d8 100644
--- a/glance/store/location.py
+++ b/glance/store/location.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/store/rbd.py b/glance/store/rbd.py
index 79871eb272..703c1aa74e 100644
--- a/glance/store/rbd.py
+++ b/glance/store/rbd.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 Josh Durgin
 # All Rights Reserved.
 #
diff --git a/glance/store/s3.py b/glance/store/s3.py
index 1f7759df2c..59ee030618 100644
--- a/glance/store/s3.py
+++ b/glance/store/s3.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/store/scrubber.py b/glance/store/scrubber.py
index 91e5a70929..547a07a012 100644
--- a/glance/store/scrubber.py
+++ b/glance/store/scrubber.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/store/sheepdog.py b/glance/store/sheepdog.py
index 767715c59d..11293f0e60 100644
--- a/glance/store/sheepdog.py
+++ b/glance/store/sheepdog.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Taobao Inc.
 # All Rights Reserved.
 #
diff --git a/glance/store/swift.py b/glance/store/swift.py
index 0a4041ce80..ec67f83add 100644
--- a/glance/store/swift.py
+++ b/glance/store/swift.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/__init__.py b/glance/tests/__init__.py
index 95ccc5916d..b39fef3587 100644
--- a/glance/tests/__init__.py
+++ b/glance/tests/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py
index 5dc4452e0b..40021298b7 100644
--- a/glance/tests/functional/__init__.py
+++ b/glance/tests/functional/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/db/base.py b/glance/tests/functional/db/base.py
index 9f4f0530c1..6ddf638a1f 100644
--- a/glance/tests/functional/db/base.py
+++ b/glance/tests/functional/db/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2012 OpenStack Foundation
 # Copyright 2012 Justin Santa Barbara
 # Copyright 2013 IBM Corp.
diff --git a/glance/tests/functional/store/__init__.py b/glance/tests/functional/store/__init__.py
index 119aded2d9..ff89821bbb 100644
--- a/glance/tests/functional/store/__init__.py
+++ b/glance/tests/functional/store/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_cinder.py b/glance/tests/functional/store/test_cinder.py
index 8b81bbb2cf..8458b55b34 100644
--- a/glance/tests/functional/store/test_cinder.py
+++ b/glance/tests/functional/store/test_cinder.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_filesystem.py b/glance/tests/functional/store/test_filesystem.py
index 504c7d6c49..19a0a3f0ed 100644
--- a/glance/tests/functional/store/test_filesystem.py
+++ b/glance/tests/functional/store/test_filesystem.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_gridfs.py b/glance/tests/functional/store/test_gridfs.py
index 9e636fb11c..94fc4dac72 100644
--- a/glance/tests/functional/store/test_gridfs.py
+++ b/glance/tests/functional/store/test_gridfs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_http.py b/glance/tests/functional/store/test_http.py
index 2c0bda05d1..c447bc0dfd 100644
--- a/glance/tests/functional/store/test_http.py
+++ b/glance/tests/functional/store/test_http.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_rbd.py b/glance/tests/functional/store/test_rbd.py
index 0dc0d3e7d7..15188c0d17 100644
--- a/glance/tests/functional/store/test_rbd.py
+++ b/glance/tests/functional/store/test_rbd.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_s3.py b/glance/tests/functional/store/test_s3.py
index e64bfb0785..ae7304254a 100644
--- a/glance/tests/functional/store/test_s3.py
+++ b/glance/tests/functional/store/test_s3.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_sheepdog.py b/glance/tests/functional/store/test_sheepdog.py
index f568506443..87ff49c5d6 100644
--- a/glance/tests/functional/store/test_sheepdog.py
+++ b/glance/tests/functional/store/test_sheepdog.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Taobao Inc.
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store/test_swift.py b/glance/tests/functional/store/test_swift.py
index db7886ac13..1f1b38e3f5 100644
--- a/glance/tests/functional/store/test_swift.py
+++ b/glance/tests/functional/store/test_swift.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/store_utils.py b/glance/tests/functional/store_utils.py
index 3fca5e79bf..c20fbaf0d4 100644
--- a/glance/tests/functional/store_utils.py
+++ b/glance/tests/functional/store_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2012 Red Hat, Inc
 # All Rights Reserved.
diff --git a/glance/tests/functional/test_bin_glance_cache_manage.py b/glance/tests/functional/test_bin_glance_cache_manage.py
index b9ce52a934..f5459f59ed 100644
--- a/glance/tests/functional/test_bin_glance_cache_manage.py
+++ b/glance/tests/functional/test_bin_glance_cache_manage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/test_cache_middleware.py b/glance/tests/functional/test_cache_middleware.py
index 8b4fcb5e52..10737cc2c1 100644
--- a/glance/tests/functional/test_cache_middleware.py
+++ b/glance/tests/functional/test_cache_middleware.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/test_client_exceptions.py b/glance/tests/functional/test_client_exceptions.py
index 8cef59e97e..0aefece287 100644
--- a/glance/tests/functional/test_client_exceptions.py
+++ b/glance/tests/functional/test_client_exceptions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2012 Red Hat, Inc
 # All Rights Reserved.
diff --git a/glance/tests/functional/test_client_redirects.py b/glance/tests/functional/test_client_redirects.py
index 7653645846..9a34637ca9 100644
--- a/glance/tests/functional/test_client_redirects.py
+++ b/glance/tests/functional/test_client_redirects.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/test_glance_manage.py b/glance/tests/functional/test_glance_manage.py
index 81ef66915a..fdfaed04f3 100644
--- a/glance/tests/functional/test_glance_manage.py
+++ b/glance/tests/functional/test_glance_manage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat, Inc
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/test_gzip_middleware.py b/glance/tests/functional/test_gzip_middleware.py
index 59fff30edb..459e4c95ec 100644
--- a/glance/tests/functional/test_gzip_middleware.py
+++ b/glance/tests/functional/test_gzip_middleware.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/test_logging.py b/glance/tests/functional/test_logging.py
index 248f837dcb..0e8fe7a92a 100644
--- a/glance/tests/functional/test_logging.py
+++ b/glance/tests/functional/test_logging.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/test_scrubber.py b/glance/tests/functional/test_scrubber.py
index 056875cc7f..aa6fa37130 100644
--- a/glance/tests/functional/test_scrubber.py
+++ b/glance/tests/functional/test_scrubber.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/test_sqlite.py b/glance/tests/functional/test_sqlite.py
index 423b0f4c0f..09718af1b1 100644
--- a/glance/tests/functional/test_sqlite.py
+++ b/glance/tests/functional/test_sqlite.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat, Inc
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/v1/test_api.py b/glance/tests/functional/v1/test_api.py
index da1b2cb6a5..5f9c2d5be0 100644
--- a/glance/tests/functional/v1/test_api.py
+++ b/glance/tests/functional/v1/test_api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/v1/test_copy_to_file.py b/glance/tests/functional/v1/test_copy_to_file.py
index f712bced34..3b94cb6992 100644
--- a/glance/tests/functional/v1/test_copy_to_file.py
+++ b/glance/tests/functional/v1/test_copy_to_file.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2012 Red Hat, Inc
 # All Rights Reserved.
diff --git a/glance/tests/functional/v1/test_misc.py b/glance/tests/functional/v1/test_misc.py
index 9fb9fe0595..5955975c95 100644
--- a/glance/tests/functional/v1/test_misc.py
+++ b/glance/tests/functional/v1/test_misc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/v1/test_multiprocessing.py b/glance/tests/functional/v1/test_multiprocessing.py
index 7f77022f23..f6eeb15d71 100644
--- a/glance/tests/functional/v1/test_multiprocessing.py
+++ b/glance/tests/functional/v1/test_multiprocessing.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/v1/test_ssl.py b/glance/tests/functional/v1/test_ssl.py
index d1244c7dda..29fa920af0 100644
--- a/glance/tests/functional/v1/test_ssl.py
+++ b/glance/tests/functional/v1/test_ssl.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/v2/test_images.py b/glance/tests/functional/v2/test_images.py
index 306756d0ff..6f24e2f2ae 100644
--- a/glance/tests/functional/v2/test_images.py
+++ b/glance/tests/functional/v2/test_images.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/v2/test_schemas.py b/glance/tests/functional/v2/test_schemas.py
index 634c378d6b..aefa8c5273 100644
--- a/glance/tests/functional/v2/test_schemas.py
+++ b/glance/tests/functional/v2/test_schemas.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/functional/v2/test_tasks.py b/glance/tests/functional/v2/test_tasks.py
index 39a8123c3c..c53bf0dea9 100644
--- a/glance/tests/functional/v2/test_tasks.py
+++ b/glance/tests/functional/v2/test_tasks.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
 #
diff --git a/glance/tests/integration/v2/base.py b/glance/tests/integration/v2/base.py
index 249da93b37..0ac20538fa 100644
--- a/glance/tests/integration/v2/base.py
+++ b/glance/tests/integration/v2/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
diff --git a/glance/tests/integration/v2/test_tasks_api.py b/glance/tests/integration/v2/test_tasks_api.py
index 0c40e86eb7..6dfefa9a2a 100644
--- a/glance/tests/integration/v2/test_tasks_api.py
+++ b/glance/tests/integration/v2/test_tasks_api.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
diff --git a/glance/tests/stubs.py b/glance/tests/stubs.py
index 3c99b7d65d..2e93bc0229 100644
--- a/glance/tests/stubs.py
+++ b/glance/tests/stubs.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/api/middleware/test_cache_manage.py b/glance/tests/unit/api/middleware/test_cache_manage.py
index 59146ef3af..283ce64072 100644
--- a/glance/tests/unit/api/middleware/test_cache_manage.py
+++ b/glance/tests/unit/api/middleware/test_cache_manage.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
 #    a copy of the License at
diff --git a/glance/tests/unit/api/test_property_protections.py b/glance/tests/unit/api/test_property_protections.py
index 6922b0b743..be0d82f52d 100644
--- a/glance/tests/unit/api/test_property_protections.py
+++ b/glance/tests/unit/api/test_property_protections.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py
index 7dc24acb42..eb28d05d73 100644
--- a/glance/tests/unit/base.py
+++ b/glance/tests/unit/base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/common/test_config.py b/glance/tests/unit/common/test_config.py
index 7be3205432..213f37f385 100644
--- a/glance/tests/unit/common/test_config.py
+++ b/glance/tests/unit/common/test_config.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/common/test_exception.py b/glance/tests/unit/common/test_exception.py
index f9b1eec1bf..2184394bcf 100644
--- a/glance/tests/unit/common/test_exception.py
+++ b/glance/tests/unit/common/test_exception.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/common/test_rpc.py b/glance/tests/unit/common/test_rpc.py
index 81bd98d8fe..ded1e7f2ca 100644
--- a/glance/tests/unit/common/test_rpc.py
+++ b/glance/tests/unit/common/test_rpc.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # -*- coding: utf-8 -*-
 
 # Copyright 2013 Red Hat, Inc.
diff --git a/glance/tests/unit/common/test_utils.py b/glance/tests/unit/common/test_utils.py
index a4374e80b0..18ea5c96c0 100644
--- a/glance/tests/unit/common/test_utils.py
+++ b/glance/tests/unit/common/test_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/common/test_wsgi.py b/glance/tests/unit/common/test_wsgi.py
index 8f1c34cb0e..829c7597a3 100644
--- a/glance/tests/unit/common/test_wsgi.py
+++ b/glance/tests/unit/common/test_wsgi.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_auth.py b/glance/tests/unit/test_auth.py
index 30e9e8d9ed..8f23e19634 100644
--- a/glance/tests/unit/test_auth.py
+++ b/glance/tests/unit/test_auth.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
diff --git a/glance/tests/unit/test_cached_images.py b/glance/tests/unit/test_cached_images.py
index e60d7017e4..c0360384b8 100644
--- a/glance/tests/unit/test_cached_images.py
+++ b/glance/tests/unit/test_cached_images.py
@@ -12,7 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import testtools
 import webob
diff --git a/glance/tests/unit/test_cinder_store.py b/glance/tests/unit/test_cinder_store.py
index 5b9062530e..1879aca664 100644
--- a/glance/tests/unit/test_cinder_store.py
+++ b/glance/tests/unit/test_cinder_store.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_context.py b/glance/tests/unit/test_context.py
index 79150e47ec..6bc02dd08c 100644
--- a/glance/tests/unit/test_context.py
+++ b/glance/tests/unit/test_context.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_filesystem_store.py b/glance/tests/unit/test_filesystem_store.py
index f505bb8c48..b65dbaa5f6 100644
--- a/glance/tests/unit/test_filesystem_store.py
+++ b/glance/tests/unit/test_filesystem_store.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_glance_replicator.py b/glance/tests/unit/test_glance_replicator.py
index 2c589b5a46..0429dc3907 100644
--- a/glance/tests/unit/test_glance_replicator.py
+++ b/glance/tests/unit/test_glance_replicator.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2012 Michael Still and Canonical Inc
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/glance/tests/unit/test_http_store.py b/glance/tests/unit/test_http_store.py
index 710a53d036..104e31ad49 100644
--- a/glance/tests/unit/test_http_store.py
+++ b/glance/tests/unit/test_http_store.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_image_cache.py b/glance/tests/unit/test_image_cache.py
index e3c930c457..36613e087c 100644
--- a/glance/tests/unit/test_image_cache.py
+++ b/glance/tests/unit/test_image_cache.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py
index a9a557b28a..ecc5af9556 100644
--- a/glance/tests/unit/test_migrations.py
+++ b/glance/tests/unit/test_migrations.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 # Copyright 2013 IBM Corp.
diff --git a/glance/tests/unit/test_misc.py b/glance/tests/unit/test_misc.py
index a8ef7cc51b..624ecc8a71 100644
--- a/glance/tests/unit/test_misc.py
+++ b/glance/tests/unit/test_misc.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_notifier.py b/glance/tests/unit/test_notifier.py
index 7ba05a94ad..3cfd564219 100644
--- a/glance/tests/unit/test_notifier.py
+++ b/glance/tests/unit/test_notifier.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
diff --git a/glance/tests/unit/test_s3_store.py b/glance/tests/unit/test_s3_store.py
index a23e1848bd..172e36d3a5 100644
--- a/glance/tests/unit/test_s3_store.py
+++ b/glance/tests/unit/test_s3_store.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_scrubber.py b/glance/tests/unit/test_scrubber.py
index 48604e46f8..29f9e4b7c1 100644
--- a/glance/tests/unit/test_scrubber.py
+++ b/glance/tests/unit/test_scrubber.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_store_base.py b/glance/tests/unit/test_store_base.py
index 6609fdce5a..0803aaabea 100644
--- a/glance/tests/unit/test_store_base.py
+++ b/glance/tests/unit/test_store_base.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py
index 372317569d..6165fc850e 100644
--- a/glance/tests/unit/test_store_location.py
+++ b/glance/tests/unit/test_store_location.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_swift_store.py b/glance/tests/unit/test_swift_store.py
index b09f03065f..0ca2d08ad9 100644
--- a/glance/tests/unit/test_swift_store.py
+++ b/glance/tests/unit/test_swift_store.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/test_versions.py b/glance/tests/unit/test_versions.py
index 559c8bf399..e258790c2e 100644
--- a/glance/tests/unit/test_versions.py
+++ b/glance/tests/unit/test_versions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py
index 55e96c0ba3..9ab26ceb7f 100644
--- a/glance/tests/unit/v1/test_api.py
+++ b/glance/tests/unit/v1/test_api.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # -*- coding: utf-8 -*-
 
 # Copyright 2010-2011 OpenStack Foundation
diff --git a/glance/tests/unit/v1/test_registry_api.py b/glance/tests/unit/v1/test_registry_api.py
index 64cf17ead9..e70c5f7576 100644
--- a/glance/tests/unit/v1/test_registry_api.py
+++ b/glance/tests/unit/v1/test_registry_api.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # -*- coding: utf-8 -*-
 
 # Copyright 2010-2011 OpenStack Foundation
diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py
index d7c3fb8478..b284df819a 100644
--- a/glance/tests/unit/v1/test_registry_client.py
+++ b/glance/tests/unit/v1/test_registry_client.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/v1/test_upload_utils.py b/glance/tests/unit/v1/test_upload_utils.py
index 0f78f289e2..6d4050a1d5 100644
--- a/glance/tests/unit/v1/test_upload_utils.py
+++ b/glance/tests/unit/v1/test_upload_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/tests/unit/v2/test_registry_api.py b/glance/tests/unit/v2/test_registry_api.py
index a3f67034de..cc52d6f753 100644
--- a/glance/tests/unit/v2/test_registry_api.py
+++ b/glance/tests/unit/v2/test_registry_api.py
@@ -1,4 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 # -*- coding: utf-8 -*-
 
 # Copyright 2013 Red Hat, Inc.
diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py
index 03b4ec78e9..d677798294 100644
--- a/glance/tests/unit/v2/test_registry_client.py
+++ b/glance/tests/unit/v2/test_registry_client.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
diff --git a/glance/tests/utils.py b/glance/tests/utils.py
index c926c08a85..96d95df8ba 100644
--- a/glance/tests/utils.py
+++ b/glance/tests/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
diff --git a/glance/version.py b/glance/version.py
index d8151836a8..0172206cd3 100644
--- a/glance/version.py
+++ b/glance/version.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 46309af8fa..548ece223d 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.