Some more removals. Using ifdefs instead of read deletions in Yahoo! dir to not make merges too complicated (although upstream really seems dead at this point :-/).
