Also removes unused code and unnecessary dependencies from it.

Reviewed-on: https://gerrit.libreoffice.org/50444Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit c2f7759e)

Change-Id: Ib6de29358098846ca5e7330b10e67a88cfff8a6a