Start cleanup of views and i18n