Revert "einige Änderungen + codereste"

This reverts commit 6ca17128c302ebcbfddcc474b5f336fad4824a2e.