more work on memory leaks
last memory leak work