diff --git a/addons/survey/__init__.py b/addons/survey/__init__.py
index 2ae24dfc418..0f961ebd110 100644
--- a/addons/survey/__init__.py
+++ b/addons/survey/__init__.py
@@ -22,5 +22,3 @@
 import survey
 import controllers
 import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 92dec026508..c3833d38a6c 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -57,5 +57,3 @@ sent mails with personal token for the invitation of the survey.
     'images': [],
     'css': ['static/src/css/survey.css'],
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/controllers/__init__.py b/addons/survey/controllers/__init__.py
index b8c8a325f69..672df6ec1f9 100644
--- a/addons/survey/controllers/__init__.py
+++ b/addons/survey/controllers/__init__.py
@@ -20,5 +20,3 @@
 ##############################################################################
 
 import main
-
-# vim: exp and tab: smartindent: tabstop=4: softtabstop=4: shiftwidth=4:
diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 0ea3a160786..076e67aec62 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -430,5 +430,3 @@ def dict_soft_update(dictionary, key, value):
         dictionary[key].append(value)
     else:
         dictionary.update({key: [value]})
-
-# vim: exp and tab: smartindent: tabstop=4: softtabstop=4: shiftwidth=4:
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 03539d6f9b3..091cf0745d1 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -1057,5 +1057,3 @@ def dict_keys_startswith(dictionary, string):
     .. note::
         This function uses dictionary comprehensions (Python >= 2.7)'''
     return {k: dictionary[k] for k in filter(lambda key: key.startswith(string), dictionary.keys())}
-
-# vim: exp and tab: smartindent: tabstop=4: softtabstop=4: shiftwidth=4:
diff --git a/addons/survey/test/survey_test.py b/addons/survey/test/survey_test.py
index 014d2e26e4a..ea9001a2421 100644
--- a/addons/survey/test/survey_test.py
+++ b/addons/survey/test/survey_test.py
@@ -25,5 +25,3 @@
 
 class test_survey():
     pass
-
-# vim: exp and tab: smartindent: tabstop=4: softtabstop=4: shiftwidth=4:
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index ba6bde44266..d4090570b93 100644
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -20,5 +20,3 @@
 ##############################################################################
 
 import survey_email_compose_message
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_email_compose_message.py b/addons/survey/wizard/survey_email_compose_message.py
index 77f98ac68e3..a5f978fdd47 100644
--- a/addons/survey/wizard/survey_email_compose_message.py
+++ b/addons/survey/wizard/survey_email_compose_message.py
@@ -218,5 +218,3 @@ class survey_mail_compose_message(osv.TransientModel):
                 create_response_and_send_mail(wizard, token, partner['id'], partner['email'])
 
         return {'type': 'ir.actions.act_window_close'}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: