Code Alignment part 1 - Remove most BOMs