Cleaning up navigation links