Remove commented debugging code. Replace tabs with spaces

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Remove trailing whitespaces

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>