Improve remove in heap