Merge "Remove reduntant variable"