Cleanup unecessary ifdefs