Few bits of documentation related cleanup

Remove unused globals

Fixup returns

Change-Id: I959643c51529f93f2fb753f2506d43627ff9f96d
Merge "Few bits of documentation related cleanup"