Clean UP of device tree