Remove dirty block state update if a block is removed Try using BinaryHelper to ensure state updates don't fail if a current block doesn't support that state