Remove extraneous allocations