Remove some ifdefs