Simplify Device_init and remove resulting dead code