Revert "Big update (testing)"

This reverts commit ab0192ed95c031b23748668b26e98a3757db7f0b.