clean up of the device tree and 4.3 changes