Merge "Remove some unnecessary operations" into main