Device tree cleanup