Working towards a clean routing solution