diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
index 0718615e312..45102cc824d 100644
--- a/addons/account/views/account.xml
+++ b/addons/account/views/account.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
diff --git a/addons/account_analytic_analysis/views/account_analytic_analysis.xml b/addons/account_analytic_analysis/views/account_analytic_analysis.xml
index dced07310d8..d54b80ece15 100644
--- a/addons/account_analytic_analysis/views/account_analytic_analysis.xml
+++ b/addons/account_analytic_analysis/views/account_analytic_analysis.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="account_analytic_analysis assets" inherit_id="web.assets_backend">
diff --git a/addons/account_analytic_plans/views/account_analytic_plans.xml b/addons/account_analytic_plans/views/account_analytic_plans.xml
index 306e8616496..9a56d478818 100644
--- a/addons/account_analytic_plans/views/account_analytic_plans.xml
+++ b/addons/account_analytic_plans/views/account_analytic_plans.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="account analytic plans assets" inherit_id="web.assets_backend">
diff --git a/addons/auth_oauth/views/auth_oauth_login.xml b/addons/auth_oauth/views/auth_oauth_login.xml
index 6c5deca924c..a8fe99d30f8 100644
--- a/addons/auth_oauth/views/auth_oauth_login.xml
+++ b/addons/auth_oauth/views/auth_oauth_login.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="auth_oauth.providers" name="OAuth Providers">
diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index 75fd2a8fe45..7e10ea3fce8 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1: -->
 <templates id="template" xml:space="preserve">
 
     <t t-extend="Login">
diff --git a/addons/auth_openid/views/auth_openid.xml b/addons/auth_openid/views/auth_openid.xml
index 52187446c32..9d1f5d42cd1 100644
--- a/addons/auth_openid/views/auth_openid.xml
+++ b/addons/auth_openid/views/auth_openid.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="auth_openid assets" inherit_id="web.assets_backend">
diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
index 27d80dfb5bf..0a4ddfc1b30 100644
--- a/addons/auth_signup/views/auth_signup_login.xml
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="auth_signup.login" inherit_id="web.login" name="Sign up - Reset Password">
diff --git a/addons/barcodes/views/templates.xml b/addons/barcodes/views/templates.xml
index 9e255e57290..ca30a273a75 100644
--- a/addons/barcodes/views/templates.xml
+++ b/addons/barcodes/views/templates.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
 
diff --git a/addons/base_import/views/base_import.xml b/addons/base_import/views/base_import.xml
index 809241c52ca..34d1d265b5c 100644
--- a/addons/base_import/views/base_import.xml
+++ b/addons/base_import/views/base_import.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="base_import assets" inherit_id="web.assets_backend">
diff --git a/addons/base_setup/views/base_setup.xml b/addons/base_setup/views/base_setup.xml
index 77e91eeb6cd..6eed238c0eb 100644
--- a/addons/base_setup/views/base_setup.xml
+++ b/addons/base_setup/views/base_setup.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="base_setup assets" inherit_id="web.assets_backend">
diff --git a/addons/board/views/board.xml b/addons/board/views/board.xml
index a9bd206f243..5bf2e75125e 100644
--- a/addons/board/views/board.xml
+++ b/addons/board/views/board.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="board assets" inherit_id="web.assets_backend">
diff --git a/addons/bus/views/bus.xml b/addons/bus/views/bus.xml
index 4f24e27f897..8c4e1eb8ab2 100644
--- a/addons/bus/views/bus.xml
+++ b/addons/bus/views/bus.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="im assets" inherit_id="web.assets_backend">
diff --git a/addons/calendar/views/calendar.xml b/addons/calendar/views/calendar.xml
index 5eb04383986..714a7d706ca 100644
--- a/addons/calendar/views/calendar.xml
+++ b/addons/calendar/views/calendar.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="calendar assets" inherit_id="web.assets_backend">
diff --git a/addons/document/views/document.xml b/addons/document/views/document.xml
index 3f14b387bdf..813ed7b7bd7 100644
--- a/addons/document/views/document.xml
+++ b/addons/document/views/document.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="document assets" inherit_id="web.assets_backend">
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 69f06356127..85ae73aa6c6 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -73,4 +73,3 @@ instance.edi.edi_import = function (url) {
 }
 
 };
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/edi/views/edi.xml b/addons/edi/views/edi.xml
index 71a6daeaff4..aee32fa9cec 100644
--- a/addons/edi/views/edi.xml
+++ b/addons/edi/views/edi.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="edi assets" inherit_id="web.assets_backend">
diff --git a/addons/event/views/event.xml b/addons/event/views/event.xml
index 31623659eba..7602a93e587 100644
--- a/addons/event/views/event.xml
+++ b/addons/event/views/event.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="event assets" inherit_id="web.assets_backend">
diff --git a/addons/gamification/views/gamification.xml b/addons/gamification/views/gamification.xml
index df5f119d6c1..1e2f0096ea5 100644
--- a/addons/gamification/views/gamification.xml
+++ b/addons/gamification/views/gamification.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="gamification assets" inherit_id="web.assets_backend">
diff --git a/addons/google_calendar/views/google_calendar.xml b/addons/google_calendar/views/google_calendar.xml
index d25a2fa2406..430e8bd48d5 100644
--- a/addons/google_calendar/views/google_calendar.xml
+++ b/addons/google_calendar/views/google_calendar.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="google_calendar assets" inherit_id="web.assets_backend">
diff --git a/addons/google_drive/views/google_drive.xml b/addons/google_drive/views/google_drive.xml
index 5017f53f1a8..9d14fa463cc 100644
--- a/addons/google_drive/views/google_drive.xml
+++ b/addons/google_drive/views/google_drive.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="google_drive assets" inherit_id="web.assets_backend">
diff --git a/addons/google_spreadsheet/views/google_spreadsheet.xml b/addons/google_spreadsheet/views/google_spreadsheet.xml
index 8fe8ddfcb8c..51ede3dd41c 100644
--- a/addons/google_spreadsheet/views/google_spreadsheet.xml
+++ b/addons/google_spreadsheet/views/google_spreadsheet.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="google_spreadsheet assets" inherit_id="web.assets_backend">
diff --git a/addons/hr/views/hr.xml b/addons/hr/views/hr.xml
index 099697d67d0..ad153be42eb 100644
--- a/addons/hr/views/hr.xml
+++ b/addons/hr/views/hr.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="hr assets" inherit_id="web.assets_backend">
diff --git a/addons/hr_attendance/views/hr_attendance.xml b/addons/hr_attendance/views/hr_attendance.xml
index 9f229b92abb..473c9541074 100644
--- a/addons/hr_attendance/views/hr_attendance.xml
+++ b/addons/hr_attendance/views/hr_attendance.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="hr_attendance assets" inherit_id="web.assets_backend">
diff --git a/addons/hr_gamification/views/hr_gamification.xml b/addons/hr_gamification/views/hr_gamification.xml
index 8d34de257d3..d3cbeacd815 100644
--- a/addons/hr_gamification/views/hr_gamification.xml
+++ b/addons/hr_gamification/views/hr_gamification.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="hr_gamification assets" inherit_id="web.assets_backend">
diff --git a/addons/hr_recruitment/views/hr_recruitment.xml b/addons/hr_recruitment/views/hr_recruitment.xml
index 241f787053e..e9060dd8881 100644
--- a/addons/hr_recruitment/views/hr_recruitment.xml
+++ b/addons/hr_recruitment/views/hr_recruitment.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="hr_recruitment assets" inherit_id="web.assets_backend">
diff --git a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
index 7a13b9ecad4..2bd85c34db5 100644
--- a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
+++ b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="hr_timesheet_sheet assets" inherit_id="web.assets_backend">
diff --git a/addons/im_chat/static/src/xml/im_chat.xml b/addons/im_chat/static/src/xml/im_chat.xml
index cc94f587b38..356cc27fc0d 100644
--- a/addons/im_chat/static/src/xml/im_chat.xml
+++ b/addons/im_chat/static/src/xml/im_chat.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates xml:space="preserve">
 <t t-name="im_chat.Conversation">
     <div class="oe_im_chatview_header">
diff --git a/addons/im_livechat/views/im_livechat.xml b/addons/im_livechat/views/im_livechat.xml
index 1b3811bad90..2c8f299687d 100644
--- a/addons/im_livechat/views/im_livechat.xml
+++ b/addons/im_livechat/views/im_livechat.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
 
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index a6de0ced477..9f172244b20 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -650,4 +650,4 @@
             <field name="state">open</field>
         </record>
 </data>
-</openerp><!-- vim: set fdm=marker : -->
+</openerp>
diff --git a/addons/lunch/views/lunch.xml b/addons/lunch/views/lunch.xml
index e4595359720..d7e7244d28c 100644
--- a/addons/lunch/views/lunch.xml
+++ b/addons/lunch/views/lunch.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="lunch assets" inherit_id="web.assets_backend">
diff --git a/addons/mail/views/mail.xml b/addons/mail/views/mail.xml
index 827cc3c76c9..c2ba922ab2d 100644
--- a/addons/mail/views/mail.xml
+++ b/addons/mail/views/mail.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="mail assets" inherit_id="web.assets_backend">
diff --git a/addons/note/views/note.xml b/addons/note/views/note.xml
index 0c172433cbc..b685078acc9 100644
--- a/addons/note/views/note.xml
+++ b/addons/note/views/note.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="note assets" inherit_id="web.assets_backend">
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index 5d2ab779ead..b80cf3a6069 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates id="template" xml:space="preserve">
 
     <t t-name="FieldPad">
diff --git a/addons/pad/views/pad.xml b/addons/pad/views/pad.xml
index b40545df097..f87ceedb567 100644
--- a/addons/pad/views/pad.xml
+++ b/addons/pad/views/pad.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="pad assets" inherit_id="web.assets_backend">
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 3303cbd320d..9a46ac07cdf 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -27,5 +27,3 @@ import res_users
 import res_partner
 import wizard
 import res_config
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index f960872abc0..4a273fb84a2 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates id="template" xml:space="preserve">
 
     <t t-name="Chrome">
diff --git a/addons/point_of_sale/views/point_of_sale.xml b/addons/point_of_sale/views/point_of_sale.xml
index 4526f9525aa..27371ff80fa 100644
--- a/addons/point_of_sale/views/point_of_sale.xml
+++ b/addons/point_of_sale/views/point_of_sale.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets" name="point_of_sale assets">
diff --git a/addons/point_of_sale/views/templates.xml b/addons/point_of_sale/views/templates.xml
index 49dbfd0613f..9a9f7f1d5c1 100644
--- a/addons/point_of_sale/views/templates.xml
+++ b/addons/point_of_sale/views/templates.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
 
diff --git a/addons/portal/views/portal.xml b/addons/portal/views/portal.xml
index 7421c435840..78ea72a1c40 100644
--- a/addons/portal/views/portal.xml
+++ b/addons/portal/views/portal.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="portal assets" inherit_id="web.assets_backend">
diff --git a/addons/portal_project_issue/views/portal_project_issue.xml b/addons/portal_project_issue/views/portal_project_issue.xml
index eece1977243..722630ea49a 100644
--- a/addons/portal_project_issue/views/portal_project_issue.xml
+++ b/addons/portal_project_issue/views/portal_project_issue.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="portal_project_issue assets" inherit_id="web.assets_backend">
diff --git a/addons/pos_restaurant/views/templates.xml b/addons/pos_restaurant/views/templates.xml
index cbabdf13c35..a3bf67a54b7 100644
--- a/addons/pos_restaurant/views/templates.xml
+++ b/addons/pos_restaurant/views/templates.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
 
diff --git a/addons/project/views/project.xml b/addons/project/views/project.xml
index 07d05b072ed..0fe262b302b 100644
--- a/addons/project/views/project.xml
+++ b/addons/project/views/project.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="project assets" inherit_id="web.assets_backend">
diff --git a/addons/purchase_requisition/views/purchase_requisition.xml b/addons/purchase_requisition/views/purchase_requisition.xml
index 3d9ecc7d78f..c3619497f89 100644
--- a/addons/purchase_requisition/views/purchase_requisition.xml
+++ b/addons/purchase_requisition/views/purchase_requisition.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="purchase requisition assets" inherit_id="web.assets_backend">
diff --git a/addons/report/views/report.xml b/addons/report/views/report.xml
index 313111fa9f1..0d8b034d2b2 100644
--- a/addons/report/views/report.xml
+++ b/addons/report/views/report.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="report assets" inherit_id="web.assets_backend">
diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml
index 1d9bc987afc..b24285ba6e3 100644
--- a/addons/share/static/src/xml/share.xml
+++ b/addons/share/static/src/xml/share.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates id="template" xml:space="preserve">
 
     <!-- Extends Chatter widget in form view to add the invite button -->
diff --git a/addons/share/views/share.xml b/addons/share/views/share.xml
index aa507eed3e2..bc138ba9414 100644
--- a/addons/share/views/share.xml
+++ b/addons/share/views/share.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="share assets" inherit_id="web.assets_backend">
diff --git a/addons/stock/views/stock.xml b/addons/stock/views/stock.xml
index d0592f05454..5ca52636188 100644
--- a/addons/stock/views/stock.xml
+++ b/addons/stock/views/stock.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
 
diff --git a/addons/web/static/lib/qweb/qweb-benchmark.xml b/addons/web/static/lib/qweb/qweb-benchmark.xml
index 8d1e913f3e2..a499b4f13c5 100644
--- a/addons/web/static/lib/qweb/qweb-benchmark.xml
+++ b/addons/web/static/lib/qweb/qweb-benchmark.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates id="template">
 <t t-name="benchmark"><div id="oe_notification" class="oe_notification">
         <div id="oe_notification_default">
diff --git a/addons/web/static/lib/qweb/qweb.js b/addons/web/static/lib/qweb/qweb.js
index 5fbd68b8dd1..cd65248589e 100644
--- a/addons/web/static/lib/qweb/qweb.js
+++ b/addons/web/static/lib/qweb/qweb.js
@@ -21,7 +21,6 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-// vim:set et fdm=syntax fdl=0 fdc=3 fdn=2:
 //---------------------------------------------------------
 // QWeb javascript
 //---------------------------------------------------------
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 157fb03d71a..47fafa3b65f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2692,4 +2692,3 @@ body
 
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
-// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 5155f106796..e340af6db22 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1581,5 +1581,3 @@ instance.web.embed = function (origin, dbname, login, key, action, options) {
 };
 
 })();
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 2e92bd95954..bbbc59d7bd5 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -784,5 +784,3 @@ $.fn.tooltip.Constructor.prototype.show = function () {
 instance.web.client_actions = new instance.web.Registry();
 
 })();
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 8936c40b051..82edbc2f35b 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -1342,5 +1342,3 @@ instance.web.SimpleIndexedDB = instance.web.Class.extend({
 });
 
 })();
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index d2c67416fbc..b9f0ba39067 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -2319,5 +2319,3 @@ instance.web.search.AutoComplete = instance.web.Widget.extend({
 });
 
 })();
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 48b899ccfbd..31c30a17cc7 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -6370,5 +6370,3 @@ instance.web.form.custom_widgets = new instance.web.Registry({
 });
 
 })();
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 81c1f5b2f68..f605579a767 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1571,5 +1571,3 @@ instance.web.xml_to_str = function(node) {
 instance.web.views = new instance.web.Registry();
 
 })();
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 0bface3a4d4..8fdf16b7119 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates id="template" xml:space="preserve">
 <t t-name="EmptyComponent">
     <div></div>
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 80f42335c13..67274fc1a20 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="web.assets_common">
diff --git a/addons/web_analytics/views/web_analytics.xml b/addons/web_analytics/views/web_analytics.xml
index 904a8671c5c..0c6d07b3476 100644
--- a/addons/web_analytics/views/web_analytics.xml
+++ b/addons/web_analytics/views/web_analytics.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_analytics assets" inherit_id="web.assets_backend">
diff --git a/addons/web_calendar/views/web_calendar.xml b/addons/web_calendar/views/web_calendar.xml
index 8ae9bf1fe39..98785d8e3a0 100644
--- a/addons/web_calendar/views/web_calendar.xml
+++ b/addons/web_calendar/views/web_calendar.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_calendar assets" inherit_id="web.assets_backend">
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 567cc1ae794..3ed3b450a57 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -421,5 +421,3 @@ instance.web.DiagramView = instance.web.View.extend({
     }
 });
 };
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web_diagram/views/web_diagram.xml b/addons/web_diagram/views/web_diagram.xml
index 23ff7b96e5d..d7a9db2f1b8 100644
--- a/addons/web_diagram/views/web_diagram.xml
+++ b/addons/web_diagram/views/web_diagram.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_diagram assets" inherit_id="web.assets_backend">
diff --git a/addons/web_gantt/views/web_gantt.xml b/addons/web_gantt/views/web_gantt.xml
index 1696d3228ab..6bca0dc728d 100644
--- a/addons/web_gantt/views/web_gantt.xml
+++ b/addons/web_gantt/views/web_gantt.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_gantt assets" inherit_id="web.assets_backend">
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 2d23a8e6d2e..7f418787cd2 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -522,4 +522,3 @@
             text-shadow: none !important
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
-// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index cd61ab99cb5..4a330324054 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1422,5 +1422,3 @@ instance.web_kanban.fields_registry = new instance.web.Registry({});
 instance.web_kanban.fields_registry.add('priority','instance.web_kanban.Priority');
 instance.web_kanban.fields_registry.add('kanban_state_selection','instance.web_kanban.KanbanSelection');
 };
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web_kanban/views/web_kanban.xml b/addons/web_kanban/views/web_kanban.xml
index 99245e857e2..28653872a87 100644
--- a/addons/web_kanban/views/web_kanban.xml
+++ b/addons/web_kanban/views/web_kanban.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_kanban assets" inherit_id="web.assets_backend">
diff --git a/addons/web_kanban_gauge/views/web_kanban_gauge.xml b/addons/web_kanban_gauge/views/web_kanban_gauge.xml
index 7500807a599..b658ce622f5 100644
--- a/addons/web_kanban_gauge/views/web_kanban_gauge.xml
+++ b/addons/web_kanban_gauge/views/web_kanban_gauge.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_kanban_gauge assets" inherit_id="web.assets_backend">
diff --git a/addons/web_kanban_sparkline/views/web_kanban_sparkline.xml b/addons/web_kanban_sparkline/views/web_kanban_sparkline.xml
index 0891ad2f88d..3e5f2d1e7b8 100644
--- a/addons/web_kanban_sparkline/views/web_kanban_sparkline.xml
+++ b/addons/web_kanban_sparkline/views/web_kanban_sparkline.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_kanban_sparkline assets" inherit_id="web.assets_backend">
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 0d4ab7157fa..5253d731635 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -525,4 +525,3 @@ openerp.web_linkedin = function(instance) {
         },
     });
 };
-// vim:et fdc=0 fdl=0:
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 75c4c934268..ddf1d633e43 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates xml:space="preserve">
     <t t-name="FieldChar.linkedin">
         <img class="oe_linkedin_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/>
diff --git a/addons/web_linkedin/views/web_linkedin.xml b/addons/web_linkedin/views/web_linkedin.xml
index 1c75e5d2305..60a56ba341a 100644
--- a/addons/web_linkedin/views/web_linkedin.xml
+++ b/addons/web_linkedin/views/web_linkedin.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_linkedin assets" inherit_id="web.assets_backend">
diff --git a/addons/web_tests/views/web_tests.xml b/addons/web_tests/views/web_tests.xml
index a2be583242c..18bb9446a16 100644
--- a/addons/web_tests/views/web_tests.xml
+++ b/addons/web_tests/views/web_tests.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_tests assets" inherit_id="web.assets_backend">
diff --git a/addons/web_tests_demo/views/web_tests_demo.xml b/addons/web_tests_demo/views/web_tests_demo.xml
index 75d5670484a..d9c1954dc96 100644
--- a/addons/web_tests_demo/views/web_tests_demo.xml
+++ b/addons/web_tests_demo/views/web_tests_demo.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_tests_demo assets" inherit_id="web.assets_backend">
diff --git a/addons/web_view_editor/views/web_view_editor.xml b/addons/web_view_editor/views/web_view_editor.xml
index 2f10163b0b4..73d1af445f7 100644
--- a/addons/web_view_editor/views/web_view_editor.xml
+++ b/addons/web_view_editor/views/web_view_editor.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
         <template id="assets_backend" name="web_view_editor assets" inherit_id="web.assets_backend">
diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index 385b7ffa99a..2295268ee31 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates id="template" xml:space="preserve">
 
     <t t-name="WidgetWebsiteButton">
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 0d7ae3e9821..e5a04bcf35c 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
 <templates id="template" xml:space="preserve">
     <t t-name="website.mobile_preview">
         <div class="modal fade oe_mobile_preview" tabindex="-1" role="dialog">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 6ca93994510..8b019438e23 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
 <openerp>
     <data>
 
diff --git a/debian/rules b/debian/rules
index ae227e8947a..68a3044ba16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# vim:noet:
 
 %:
 	dh ${@} -Spython_distutils
\ No newline at end of file
diff --git a/openerp-server b/openerp-server
index b9ff496c293..2a7a87f9936 100755
--- a/openerp-server
+++ b/openerp-server
@@ -4,4 +4,3 @@ import openerp
 if __name__ == "__main__":
     openerp.cli.main()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
index 49da52e07d9..8a0f54c97b8 100644
--- a/openerp/tests/phantomtest.js
+++ b/openerp/tests/phantomtest.js
@@ -147,5 +147,3 @@ if(phantom.args.length === 1) {
     pt = new PhantomTest();
     pt.run(pt.options.url_path, pt.options.code, pt.options.ready);
 }
-
-// vim:et: