Removed conditional #define