save before removing mutable state