Delete BOM, mail refactoring.