Deleted uncommon modules
Merged in po
merge cleanup

Signed-off-by: Malte Sussdorff <malte.sussdorff@cognovis.com>