Clean up device tree

Change-Id: I9ac9cd9182df126df286c23ae3dc54c9be30d2ee