Began cleaning up Scene/System