Revert "lots of changes after a lot of time"

This reverts commit 54dd4459116cb1b60e8b96d4e9538c65ed231bfb.