Remove from a few other places.

make-mac.mk

@@ -37,10 +37,6 @@ ifeq ($(ZT_ENABLE_CLUSTER),1)
 	DEFS+=-DZT_ENABLE_CLUSTER
 endif
 
-ifeq ($(ZT_ENABLE_BUTTFLARE),1)
-	DEFS+=-DZT_ENABLE_BUTTFLARE
-endif
-
 # Build miniupnpc and nat-pmp as included libraries -- extra defs are required for these sources
 DEFS+=-DMACOSX -DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -D_DARWIN_C_SOURCE -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -DOS_STRING=\"Darwin/15.0.0\" -DMINIUPNPC_VERSION_STRING=\"2.0\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR
 OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o osdep/PortMapper.o

service/OneService.cpp

@@ -67,10 +67,6 @@
 #include <ifaddrs.h>
 #endif
 
-#ifdef ZT_ENABLE_BUTTFLARE
-#include "ButtFlare.hpp"
-#endif
-
 #ifdef ZT_USE_SYSTEM_HTTP_PARSER
 #include <http_parser.h>
 #else
@@ -478,10 +474,6 @@ public:
 	unsigned int _clusterMemberId;
 #endif
 
-#ifdef ZT_ENABLE_BUTTFLARE
-	ButtFlare *butt;
-#endif
-
 	// Set to false to force service to stop
 	volatile bool _run;
 	Mutex _run_m;
@@ -1923,9 +1915,6 @@ public:
 						char friendlyName[128];
 						Utils::snprintf(friendlyName,sizeof(friendlyName),"ZeroTier One [%.16llx]",nwid);
 
-#ifdef ZT_ENABLE_BUTTFLARE
-						butt = new ButtFlare(StapFrameHandler, (void *)this);
-#endif
 						n.tap = new EthernetTap(
 							_homePath.c_str(),
 							MAC(nwc->mac),