Clean up #ifdef statements