Rose2 cleanups