Removed the last possible case of leaks