get rid of more #if's

no semantic changes