Removed more leaks.