Don't depend on avahi-server
Removed unneeded observer
Refactored server stop procedure