Issue [#3423210]: remove redundant blocks