Merge "Remove redundant code" into main