Remove shotwell/geary (upstreamed)