Futher cleanup of device tree

Signed-off-by: Charles Manning <cdhmanning@gmail.com>