[Small cleanup] Small scene related cleanup.

* Hopefully this will not result in a merge conflict later on..