Remove a couple more BOMs.