Some cleanups

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>
More cleanups

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>