Merge "Remove unused assignment"