Correct incorrect/incomplete changes during move of deleter and indexer