cleanup everything / first good version :-)