treewide: aftermerge cleanup