Remove deprecated finders