Completion: avoid memory leaks (not finished)