Remove remaining references to extra_nav