Preparation
Performance Improvement
Remove unused finder