Remove block_connected de-duplication logic