Remove deprecated finder method calls
Merge pull request #2199 from chancancode/fix_deprecated_finder_methods

Remove deprecated finder method calls