This just removes some redundant ifdeffed code: -- patrick