Merge "Remove flags that are no longer necessary" into main