Merge "Remove unused local variable and update documentation"