Remove a few potential memory leaks