This should drop wl-shell, which has been deprecated for a while. More cleanups will be following next.