cleaned up scene manager