Remove superfluous #ifdef statements