Merge "Remove unused #define." into main