Removed huge memleak