Remove usage of SpiBlock.