Refactor away unnecessary find