clean up device tree a bit

Change-Id: I45c8303c81128ab00bec3dcda55abae09fd4ed59