Clean the code to work in Zikula 1.3.7 dev mode