Merge "Remove dead blocks for the blocks_ array."