Implement automatic bootstrap using Avahi. (Code cleanup)