Increased i18n support, useless code removed from Controller.