[PATCH 03/12] Cleanup: avoid memory leak