Revert "More Basic Setup"

This reverts commit 936ce9190ba3349a0303f0f65f61cee568832852.