Remove the memory leak for good