Removed unnecessary GC allocations + cleanup.