A lot of those trailer shots are just glamour shots. For instance Jyn vs Tie Fighter, Jyn in tunnel, etc
Sure but the missing beach narrative and the larger Forrest Whitaker plot were in most of the trailers. The latter being something that might actually still fit what they ended up with.