use AllowModifyingCheckedInObject, cleanup