remove more ifdef