More memory clean-up after analysis with valgrind