diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index 5fb6e94eecc..7cc5acf2c0f 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -14,6 +14,7 @@
             <field name="street">1725 Slough Ave.</field>
             <field name="city">Scranton</field>
             <field name="zip">18540</field>
+            <field name="country_id" ref="us"/>
             <field name="phone">+1 555 123 8069</field>
             <field name="email">info@example.com</field>
             <field name="website">www.example.com</field>
diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py
index cc93df61208..9194538d3aa 100644
--- a/openerp/tools/qweb.py
+++ b/openerp/tools/qweb.py
@@ -288,9 +288,6 @@ class QWebXml(object):
             if field_type == 'many2one':
                 field_data = record.read([field])[0].get(field)
                 inner = field_data and field_data[1] or ""
-                #field = getattr(record, field)
-                #if field:
-                #    inner = field.name_get()[0][1] or ""
             else:
                 inner = getattr(record, field) or ""
             if isinstance(inner, types.UnicodeType):