Fixed Heap removal. Web-CAT submission pending.