Remove find_by_id and replace with just find