Dead code removal.
Refactor common navigation to use specific functions instead of a string based param.