Merge "Cleaning up unused flag." into main