Cleanup all the memory leaks I added