removed unnecessary ifdefs