removed spurious ifdefs