Removed some allocations