Better routing + links deletion (fixed #1)