Merge "Remove unused variable assignment"