diff --git a/entities.py b/entities.py
index 838ad9dc61efc3a9ac81471f257d46eedd4f1e9f_ZW50aXRpZXMucHk=..6a6a97aba6cfba726e339d3eb9c9e9b04e29f07e_ZW50aXRpZXMucHk= 100644
--- a/entities.py
+++ b/entities.py
@@ -1,10 +1,6 @@
 """this contains the template-specific entities' classes"""
 
-from cubes.expense.entities import Expense as BaseExpense, ExpenseLine as BaseExpenseLine
-
-class Expense(BaseExpense):
-    autocomplete_initfuncs = {'spent_for' : 'get_concerned_by'}
-
+from cubes.expense.entities import ExpenseLine as BaseExpenseLine
 
 class ExpenseLine(BaseExpenseLine):
 
diff --git a/views/__init__.py b/views/__init__.py
index 838ad9dc61efc3a9ac81471f257d46eedd4f1e9f_dmlld3MvX19pbml0X18ucHk=..6a6a97aba6cfba726e339d3eb9c9e9b04e29f07e_dmlld3MvX19pbml0X18ucHk= 100644
--- a/views/__init__.py
+++ b/views/__init__.py
@@ -5,10 +5,11 @@
 from cubicweb.web.formwidgets import RestrictedAutoCompletionWidget
 from cubicweb.web.views import basecontrollers
 
-uicfg.autoform_section.tag_subject_of(('Expense', 'spent_for', '*'), 'primary')
-uicfg.autoform_field_kwargs.tag_subject_of(('Expense', 'spent_for', '*'),
-                                           {'widget': RestrictedAutoCompletionWidget})
-
+_afs = uicfg.autoform_section
+_afs.tag_subject_of(('Expense', 'spent_for', '*'), 'primary')
+_affk = uicfg.autoform_field_kwargs
+_affk.tag_subject_of(('Expense', 'spent_for', '*'),
+                     {'widget': RestrictedAutoCompletionWidget(autocomplete_initfunc='get_concerned_by')})
 
 
 @monkeypatch(basecontrollers.JSonController)