Code cleanup in descendants crawler