Removed unnecessary ifdefs