Bring inline with klte device tree

* major clean up
* added all changes from klte device tree