removed redundant logic from TreeBlockBreaker
more small changes for IDR support