code simplification
minor
minor
refactoring, fewer leftover files in /var/run/msgcollector