Rebased device tree and cleanup

PS2: CleanUp the a bit

Change-Id: If98de860c08a005a5952c0e110f4c4cfafa78dc3