diff --git a/.circleci/config.yml b/.circleci/config.yml
index 99088d1c..9cf7d95b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,11 +24,11 @@ jobs:
           command: |
               sudo apt-get install -y alien
 
-      - run:
-          name: Test debug builds
-          command: |
-              ./build -d
-              test -f yggdrasil && test -f yggdrasilctl
+    #  - run:
+    #      name: Test debug builds
+    #      command: |
+    #          ./build -d
+    #          test -f yggdrasil && test -f yggdrasilctl
 
       - run:
           name: Build for Linux (including Debian packages and RPMs)
diff --git a/src/yggdrasil/core.go b/src/yggdrasil/core.go
index 461e8e93..5d45a489 100644
--- a/src/yggdrasil/core.go
+++ b/src/yggdrasil/core.go
@@ -40,9 +40,8 @@ type Core struct {
 	dht         dht
 	admin       admin
 	searches    searches
-	//multicast   multicast
-	link link
-	log  *log.Logger
+	link        link
+	log         *log.Logger
 }
 
 func (c *Core) init() error {
@@ -133,11 +132,9 @@ func (c *Core) UpdateConfig(config *config.NodeConfig) {
 		c.sessions.reconfigure,
 		c.peers.reconfigure,
 		c.router.reconfigure,
-		//c.router.tun.Reconfigure,
 		c.router.cryptokey.reconfigure,
 		c.switchTable.reconfigure,
 		c.link.reconfigure,
-		//c.multicast.reconfigure,
 	}
 
 	for _, component := range components {
@@ -228,11 +225,6 @@ func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) error {
 		return err
 	}
 
-	/*if err := c.multicast.start(); err != nil {
-		c.log.Errorln("Failed to start multicast interface")
-		return err
-	}*/
-
 	if err := c.router.tun.Start(c.router.addr, c.router.subnet); err != nil {
 		c.log.Errorln("Failed to start TUN/TAP")
 		return err