Improved cleanup.
Improved cleanup.

zammad/zammad,zammad/zammad,zammad/zammad,zammad/zammad,monotek/zammad,monotek/zammad,monotek/zammad,monotek/zammad,monotek/zammad,zammad/zammad,zammad/zammad,monotek/zammad