Hannes Kuchelmeister
cleanup to make ready as submodule
c7be723