Some cleanup

Signed-off-by: Jurgen Schober <jurgen.schober@pointdesign.com>