rosenberg: don't save unneeded states