refactoring, fewer leftover files in /var/run/msgcollector