Remove monkeypatches
Make sure only transient or dirty objects get saved