Correct me if I'm wrong, but aren't they in the middle of filming still? "Stream-lining" is something you either get during the script stage or during the editing stage after seeing it all come together. If they're just noticing this now mid-way through filming, how much did they look into the script? Because if it is that noticeable, it should have been - and more than often is - something they notice before they start filming. Then that points to there being a problem with the script.
To me this falls into the line of thinking that you can just randomly delete a character's poignant death from the film and that not impacting anything that came before it oddly.