remove some ifdefs