Changing From Last ID to Last Poll

Also cleaning up