cleanup device tree

Change-Id: Icfd8b2f564f8cc76ca7a569fe58e2faa870d3849