get rid of extraneous ifdef's