Merge branch 'sb/mailsplit-dead-code-removal'