Remove straggler code, fix nav link