Improve find' logic and delete a redundant import