Some cleaning job to the device tree

Change-Id: Ia384bc48f81f8a458017b7c3a914725b3364dd74