Better use of requirements. Removed the obsolete finders package.