Cleanup unused vars and doxygen

Change-Id: I290d341f37f7560ce9441136f2ee567ce5c833ad
Merge "Cleanup unused vars and doxygen"