Remove unused variables.

Minor doc additions

Remove double newlines

Change-Id: I99f14bfac891120fa20f2a6b306a58c049550146
Merge "Remove unused variables."