Added removal logic.