Clean up DB finders