Remove some leaks