Switch to jonaz/mdns and cleanup