cleanup device tree

Change-Id: If38c40a85637b40869fb27ded16565c497fb251f