Cleaned up route discovery so it is now stable