Reduce memory usage further