Cleaned up some in SceneManager.