Remove ifdefs for easier porting