Removed old discovery and old liveliness