diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml
index cfab3dc5a72..e153ddc8afe 100644
--- a/addons/website_blog/data/website_blog_demo.xml
+++ b/addons/website_blog/data/website_blog_demo.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <!-- <data noupdate="1"> -->
     <data>
 
         <!-- TAGS -->
diff --git a/addons/website_blog/security/website_blog_security.xml b/addons/website_blog/security/website_blog_security.xml
index 43ab1fa4de4..ca1ae295701 100644
--- a/addons/website_blog/security/website_blog_security.xml
+++ b/addons/website_blog/security/website_blog_security.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
-
-        <record model="ir.rule" id="website_blog_post_public">
-            <field name="name">Blog Post: public: published only</field>
-            <field name="model_id" ref="model_blog_post"/>
-            <field name="domain_force">[('website_published', '=', True)]</field>
-            <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
-        </record>
-
-    </data>
+    <record model="ir.rule" id="website_blog_post_public">
+        <field name="name">Blog Post: public: published only</field>
+        <field name="model_id" ref="model_blog_post"/>
+        <field name="domain_force">[('website_published', '=', True)]</field>
+        <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
+    </record>
 </odoo>
diff --git a/addons/website_blog/views/snippets.xml b/addons/website_blog/views/snippets.xml
index becab8dbc78..99aa271ccb8 100644
--- a/addons/website_blog/views/snippets.xml
+++ b/addons/website_blog/views/snippets.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
-<template id="website_blog" inherit_id="website.snippets" name="Snippet Blog">
+  <template id="website_blog" inherit_id="website.snippets" name="Snippet Blog">
 
     <xpath expr="//div[@id='snippet_options']" position="inside">
         <div data-js='website_blog'
@@ -40,6 +39,5 @@
         </div>
     </xpath>
 
-</template>
-</data>
+  </template>
 </odoo>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 1acea52adf6..af5c78bbea5 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
 
 <template id="assets_editor" inherit_id="website.assets_editor" name="Blog Editor">
     <xpath expr="." position="inside">
@@ -515,5 +514,4 @@
     </p>
 </template>
 
-</data>
 </odoo>
diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml
index 55261a7bb65..2322a36a581 100644
--- a/addons/website_blog/views/website_blog_views.xml
+++ b/addons/website_blog/views/website_blog_views.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <odoo>
-    <data>
         <menuitem name="Blog" id="menu_website_blog_root" sequence="20" parent="website.menu_website_configuration"/>
 
         <!-- Blog views -->
-        <record model="ir.ui.view" id="view_blog_blog_list">
+        <record id="view_blog_blog_list" model="ir.ui.view">
             <field name="name">blog.blog.list</field>
             <field name="model">blog.blog</field>
             <field name="arch" type="xml">
@@ -14,7 +13,7 @@
                 </tree>
             </field>
         </record>
-        <record model="ir.ui.view" id="view_blog_blog_form">
+        <record id="view_blog_blog_form" model="ir.ui.view">
             <field name="name">blog.blog.form</field>
             <field name="model">blog.blog</field>
             <field name="arch" type="xml">
@@ -38,7 +37,7 @@
         </record>
 
         <!-- page list view  -->
-        <record model="ir.ui.view" id="view_blog_post_list">
+        <record id="view_blog_post_list" model="ir.ui.view">
             <field name="name">blog.post.list</field>
             <field name="model">blog.post</field>
             <field name="arch" type="xml">
@@ -54,7 +53,7 @@
             </field>
         </record>
         <!-- page form view  -->
-        <record model="ir.ui.view" id="view_blog_post_form">
+        <record id="view_blog_post_form" model="ir.ui.view">
             <field name="name">blog.post.form</field>
             <field name="model">blog.post</field>
             <field name="arch" type="xml">
@@ -94,7 +93,7 @@
             </field>
         </record>
         <!-- page search view  -->
-        <record model="ir.ui.view" id="view_blog_post_search">
+        <record id="view_blog_post_search" model="ir.ui.view">
             <field name="name">blog.post.search</field>
             <field name="model">blog.post</field>
             <field name="arch" type="xml">
@@ -112,7 +111,7 @@
             </field>
         </record>
         <!-- page action -->
-        <record model="ir.actions.act_window" id="action_blog_post">
+        <record id="action_blog_post" model="ir.actions.act_window">
             <field name="name">Blog Posts</field>
             <field name="res_model">blog.post</field>
             <field name="view_type">form</field>
@@ -137,7 +136,7 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_blog_blog">
+        <record id="action_blog_blog" model="ir.actions.act_window">
             <field name="name">Blogs</field>
             <field name="res_model">blog.blog</field>
             <field name="view_type">form</field>
@@ -145,7 +144,7 @@
         </record>
         <menuitem id="menu_blog" parent="menu_website_blog_root" name="Blogs" action="action_blog_blog" sequence="20"/>
 
-        <record model="ir.ui.view" id="blog_tag_tree">
+        <record id="blog_tag_tree" model="ir.ui.view">
             <field name="name">blog_tag_tree</field>
             <field name="model">blog.tag</field>
             <field name="arch" type="xml">
@@ -156,7 +155,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="blog_tag_form">
+        <record id="blog_tag_form" model="ir.ui.view">
             <field name="name">blog_tag_form</field>
             <field name="model">blog.tag</field>
             <field name="arch" type="xml">
@@ -172,7 +171,7 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_tags">
+        <record id="action_tags" model="ir.actions.act_window">
             <field name="name">Blog Tags</field>
             <field name="res_model">blog.tag</field>
             <field name="view_type">form</field>
@@ -181,5 +180,4 @@
         </record>
 
         <menuitem id="menu_blog_tag" parent="menu_website_blog_root" name="Blog Tags" action="action_tags" sequence="40" />
-    </data>
 </odoo>