cleanups, rebuild

Signed-off-by: Stefan Helmert <stefan.helmert@t-online.de>