Removing _save_auditor function and duplicate object_model compute (both due to incorrect conflict resolution)