Correct incorrect/incomplete changes during move of deleter and indexer
Merge pull request #749 from bartcharbon/master

Correct incorrect/incomplete changes during move of deleter and indexer