SceneSetup
Revert "SceneSetup"

This reverts commit 2ed561a24d3fd32df81144aeb1be70f98b8689c7.
Revert "Scene Setup"

This reverts commit edc524fab891dfcc53b5ee3ad20c734cca773b2b.