device trees cleanup and more cm-like