cleanup
updated hybridheap to use generics