Code cleanup
Scene code cleanup