Clean up global discovery timer handing