removed device class for now