Remove deprecated finders
Merge pull request #6075 from skv-headless/remove_deprecated_finders

Remove deprecated finders