use/cleanup/x11 has been extended with commit 122c305b,
a few manually specified items can be dropped now.