More memory use reductions