More cleaning up

Signed-off-by: Robert C. Helling <helling@atdotde.de>