Merge "remove useless variable" into main