General cleanup device tree

Note: Build doesn't boot as of now.