remove device, remove switch, move device functions