Remove warning in code and some dead comments.

Change-Id: I8042ca0f4c53bbe8287b6a5d8469a463a374fc7e
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>