Revert "Setup and Draw"

This reverts commit 89963c8bfad198c03ff9479f1f0ce4e4cfde848f.