Revert "New setup method"

This reverts commit 1211917762ca053c3e3162295ca93fbcfb1f01c1.