Merge "Remove unused variable" into main