remove no longer needed #ifdefs