Remove Heap integration