and drop unused values

Change-Id: Ied5a5aa9c98417b873eeea28fb126f815e742159
Reviewed-on: https://gerrit.libreoffice.org/63947
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>