Cleanup to the default scene renderer.
More cleanup to the default scene renderer.
More cleanup.
Renaming.