remove ifdefs