Added support for removing a device