Cleanup new attributes saving PR #2594