Remove unnecessary repository method and replace with find_by_id taking multiple args