simplifing the #if defined statements