Revert "Its messy, its horrible but t0lte cannot die!!!"

This reverts commit 1dfd948794e54c1a95fcbb82cafb898c22f205b0.