Revert "start major cleanup main, done through q"

This reverts commit 00bc8deded2be5ed7a95eb097299422b47b9f6d4.