cleanup + refactorisation gc