Fix remove blocks