Rework device initialization