No, it does not need to go away. It needs to be upgraded to be fully functional.
There's a lot of potential in the current implementation, but it falls short due to a few oversights.
- It's great to have more information displayed in Analysis Mode, while Combat Mode shows the essentials.
- It would be great if both modes had their own chain of fire groups. Currently, no matter which mode you are in, you still share the same groups.
- It would not be as great, but still sufficient, if the "wrong mode" warning message would not come up. It would lack the elegance of seperate lines of fire groups, but you still could put weapons and other stuff on the same groups and switch between them by changing the mode.
- Last not least, it would be really helpful to have an alternative to "switch mode". I would really find it helpful if there was an "activate combat mode" and "activate analysis mode" binding available. (Honestly, i'd bind the "activate combat mode" to the same button which i use to deploy weapons. Then i'd be sure that if i want my guns out, i'd also be in combat mode and ready to roll. )