Further reduced heap