memory leak
Memory leak fixes