Remove trailing whitespaces

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Remove uncommented code

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>