delete more pointless ifdefs