More cleaning
Merge pull request #223 from Winnetou/patch-22

More cleaning