CLeaned up moved device tree stuff