ran "organize imports"
fixed NPE when unassigning a device