removed routeDiscoveryTimer code in order to ease merge with branch routeDiscoveryTimer2