Remove some unused variables
More code simplification around Device_init