Code cleanup

Remove dead code on the repo grouping branch

Signed-off-by: Christoph Kassen <c.kassen@telekom.de>