Merge "Remove unused code in heap.h"