Device tree cleanup and fixes