Revert "still finding ways the scenemanager could be more efficient"

This reverts commit 70204191df171be3527903b717f16ba99dc502fe.
Revert "work on performance"

This reverts commit 530736747ae79efe770fd0d2be108803bdbd5506, reversing
changes made to 67854f7a9bbf0e0c4a8a732247b14813c248a4bf.