Remove some unnecessary ifdefs