Merge branch 'treewide/cleanup' into next/soc