More memory clean up