diff --git a/gns3server/modules/dynamips/__init__.py b/gns3server/modules/dynamips/__init__.py
index 7de7a755..50ed4522 100644
--- a/gns3server/modules/dynamips/__init__.py
+++ b/gns3server/modules/dynamips/__init__.py
@@ -52,8 +52,6 @@ from .nios.nio_vde import NIOVDE
from .nios.nio_tap import NIOTAP
from .nios.nio_generic_ethernet import NIOGenericEthernet
from .nios.nio_linux_ethernet import NIOLinuxEthernet
-from .nios.nio_fifo import NIOFIFO
-from .nios.nio_mcast import NIOMcast
from .nios.nio_null import NIONull
# Adapters
diff --git a/gns3server/modules/dynamips/nios/nio_fifo.py b/gns3server/modules/dynamips/nios/nio_fifo.py
deleted file mode 100644
index 9e7695a2..00000000
--- a/gns3server/modules/dynamips/nios/nio_fifo.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 GNS3 Technologies Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-"""
-Interface for FIFO NIOs.
-"""
-
-import asyncio
-import uuid
-from .nio import NIO
-
-import logging
-log = logging.getLogger(__name__)
-
-
-class NIOFIFO(NIO):
-
- """
- Dynamips FIFO NIO.
-
- :param hypervisor: Dynamips hypervisor instance
- """
-
- def __init__(self, hypervisor):
-
- # create an unique name
- name = 'fifo-{}'.format(uuid.uuid4())
- super().__init__(name, hypervisor)
-
- @asyncio.coroutine
- def create(self):
-
- yield from self._hypervisor.send("nio create_fifo {}".format(self._name))
- log.info("NIO FIFO {name} created.".format(name=self._name))
-
- @asyncio.coroutine
- def crossconnect(self, nio):
- """
- Establishes a cross-connect between this FIFO NIO and another one.
-
- :param nio: FIFO NIO instance
- """
-
- yield from self._hypervisor.send("nio crossconnect_fifo {name} {nio}".format(name=self._name,
- nio=nio))
-
- log.info("NIO FIFO {name} crossconnected with {nio_name}.".format(name=self._name, nio_name=nio.name))
-
- def __json__(self):
-
- return {"type": "nio_fifo"}
diff --git a/gns3server/modules/dynamips/nios/nio_mcast.py b/gns3server/modules/dynamips/nios/nio_mcast.py
deleted file mode 100644
index 4ea47dc2..00000000
--- a/gns3server/modules/dynamips/nios/nio_mcast.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 GNS3 Technologies Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-"""
-Interface for multicast NIOs.
-"""
-
-import asyncio
-import uuid
-from .nio import NIO
-
-import logging
-log = logging.getLogger(__name__)
-
-
-class NIOMcast(NIO):
-
- """
- Dynamips Linux Ethernet NIO.
-
- :param hypervisor: Dynamips hypervisor instance
- :param group: multicast group to bind
- :param port: port for binding
- """
-
- def __init__(self, hypervisor, group, port):
-
- # create an unique name
- name = 'mcast-{}'.format(uuid.uuid4())
- self._group = group
- self._port = port
- self._ttl = 1 # default TTL
- super().__init__(name, hypervisor)
-
- @asyncio.coroutine
- def create(self):
-
- yield from self._hypervisor.send("nio create_mcast {name} {mgroup} {mport}".format(name=self._name,
- mgroup=self._group,
- mport=self._port))
-
- log.info("NIO Multicast {name} created with mgroup={group}, mport={port}".format(name=self._name,
- group=self._group,
- port=self._port))
-
- @property
- def group(self):
- """
- Returns the multicast group
-
- :returns: multicast group address
- """
-
- return self._group
-
- @property
- def port(self):
- """
- Returns the port
-
- :returns: port number
- """
-
- return self._port
-
- @property
- def ttl(self):
- """
- Returns the TTL associated with the multicast address.
-
- :returns: TTL value
- """
-
- return self._ttl
-
- def set_ttl(self, ttl):
- """
- Sets the TTL for the multicast address
-
- :param ttl: TTL value
- """
-
- yield from self._hypervisor.send("nio set_mcast_ttl {name} {ttl}".format(name=self._name,
- ttl=ttl))
- self._ttl = ttl
-
- def __json__(self):
-
- return {"type": "nio_mcast",
- "mgroup": self._mgroup,
- "mport": self._mport}