removed unessesary allocations