removed ifdeffed portions