copy/paste cruft removal
Close double leak