[PATCH 02/12] Cleanup: avoid memory leaks