Navlink support + removed call to unlink()