Moved props out of device tree
Cleaned some stuff
Still a long ways to go