Changing unplug to use Neutron calls too