Added removal logic