removed redundant #ifdefs