services collect plugins cleanup
tests cleanup
Merge pull request #248 from mkurek/feature/services-collect-plugins-cleanup

services collect plugins cleanup