Remove memory leak