Nuked the memory leaks