Merge "Remove unused macro definition." into main