Still cleaning up Scene/System