Try to remove memory leaks