Removed a whole mess of stuff.
Remove another heap.