Remove unneeded code required by upstream
Update welcome-email template and translations