Remove a few ifdefs