-removing legacy ifdefs