Device fix

Lots of commented lines here, can we remove them?