Merge "Remove unnecessary local variant definitation." into main