More tags removed and with it, more commented code was found. So remove it all.
Not functional changes here, just a cleanup.

Change-Id: Id4a6b3126ca32f3460dec3056b9caa370d0ee69c
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>