In my opinion they will remove those completely, but lets see, maybe we'll have a good surprise.
Btw, I've already played a few games on the demo, I like the new camera angle and the gameplay is feeling great, but I have yet to play more matches to have a more conclusive opinion.