and drop unused values

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