cleaned up device tree again