Refacto calls to Garbage Collection
Merge pull request #571 from pmiossec/refacto_garbage_collect

Refacto calls to Garbage Collection