Saga - cleanup

Change-Id: I29a132fe0fa2c8e52866601ae35b9e35416c98ba