Remove unused code/comments and adding missing tags etc.

Change-Id: I6ec7eda46a2b61bee26b4edca1bede5c00177712
1 file changed