Yahoo cleanup and todos