and adjust/cleanup calling instances

Change-Id: I6b7be34fe6fce0a6fdbf2227f3e565b2f434c88c
Reviewed-on: https://gerrit.libreoffice.org/29221Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>