Removed (hopefully) all occurences of BOM