remove unused initial_discovery_timeout, rename current_timeout

Signed-off-by: Olaf Hering <olaf@aepfle.de>