* get rid of some #ifdefs