Revert "major cleanups only in toon, untested and unstable"

This reverts commit 10c06b0a0beb8c6795c38fd3f0a2c9bd59e38049.
lets do it right this time